X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=main.cpp;h=fae6d5f20927149d4996aa0a161f07db8628580e;hb=9dbb80b0dbc0fc51a11e42f8e10fc72e9b66f694;hp=f4506787364fa11ea01286cf2e569ffed5587c15;hpb=333d5bbc0a326e6fa82db44f3e6ba8dd79cafdd8;p=pulseview.git

diff --git a/main.cpp b/main.cpp
index f4506787..fae6d5f2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,11 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern "C" {
 #include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include <signal.h>
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
-}
 
 #include <getopt.h>
 
@@ -33,9 +32,12 @@ extern "C" {
 
 #include "config.h"
 
+// Global pointer to our QApplication
+QApplication *g_app = NULL;
+
 void usage()
 {
-	fprintf(stderr,
+	fprintf(stdout,
 		"Usage:\n"
 		"  %s — %s\n"
 		"\n"
@@ -45,12 +47,30 @@ void usage()
 		"\n", PV_BIN_NAME, PV_DESCRIPTION);
 }
 
+/*
+ * SIGINT handler (likely received Ctrl-C from terminal)
+ */
+void sigint_handler(int param)
+{
+	(void)param;
+
+	qDebug("Received SIGINT.");
+
+	if (g_app)
+		g_app->quit();
+}
+
 int main(int argc, char *argv[])
 {
 	int ret = 0;
 	struct sr_context *sr_ctx = NULL;
 
+	// Register a SIGINT handler
+	signal(SIGINT, sigint_handler);
+
 	QApplication a(argc, argv);
+	// Now we have an application to populate our global pointer
+	g_app = &a;
 
 	// Set some application metadata
 	QApplication::setApplicationVersion(PV_VERSION_STRING);
@@ -73,7 +93,7 @@ int main(int argc, char *argv[])
 		switch (c) {
 		case 'V':
 			// Print version info
-			fprintf(stderr, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
 			return 0;
 
 		case 'h':