X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=ce1257300383e30fe1b6daa8893820737699cac4;hp=cdc750aa80aade18b21916708463189c78a41f9a;hb=cd0b243a41af5c63f200a647bf435a50f03ad5d6;hpb=caa2b3e9bd8dc1be0052693bb9bb1a9d4d3e00d8

diff --git a/main.cpp b/main.cpp
index cdc750a..ce12573 100644
--- a/main.cpp
+++ b/main.cpp
@@ -155,7 +155,6 @@ void usage()
 		"  -i, --input-file                Load input from file\n"
 		"  -I, --input-format              Input format\n"
 		"  -c, --clean                     Don't restore previous sessions on startup\n"
-		"  -s, --log-to-stdout             Don't use logging, output to stdout instead\n"
 		"\n", PV_BIN_NAME);
 }
 
@@ -167,7 +166,6 @@ int main(int argc, char *argv[])
 	vector<string> open_files;
 	bool restore_sessions = true;
 	bool do_scan = true;
-	bool do_logging = true;
 
 	Application a(argc, argv);
 
@@ -193,7 +191,7 @@ int main(int argc, char *argv[])
 		};
 
 		const int c = getopt_long(argc, argv,
-			"h?VDcsl:d:i:I:", long_options, nullptr);
+			"h?VDcl:d:i:I:", long_options, nullptr);
 		if (c == -1)
 			break;
 
@@ -248,24 +246,19 @@ int main(int argc, char *argv[])
 		case 'c':
 			restore_sessions = false;
 			break;
-
-		case 's':
-			do_logging = false;
-			break;
 		}
 	}
+	argc -= optind;
+	argv += optind;
 
-	while (argc - optind > 0) {
-		open_files.push_back(argv[optind]);
-		optind++;
-	}
+	for (int i = 0; i < argc; i++)
+		open_files.push_back(argv[i]);
 
 	// Prepare the global settings since logging needs them early on
 	pv::GlobalSettings settings;
 	settings.set_defaults_where_needed();
 
-	if (do_logging)
-		pv::logging.init();
+	pv::logging.init();
 
 	// Initialise libsigrok
 	context = sigrok::Context::create();