allow graceful exit

src/complexplot/ComplexplotWrapper.cpp

@@ -42,6 +42,10 @@ ComplexplotWrapper::ComplexplotWrapper()
 
 ComplexplotWrapper::~ComplexplotWrapper()
 {
+  if(QCoreApplication::instance() == NULL) {
+    destroyed_ = true;
+  }
+
   if(destroyed_)
     emit destroyWidgetSignal();
   else

src/keyvalue/KeyValueWrapper.cpp

@@ -39,6 +39,10 @@ KeyValueWrapper::KeyValueWrapper()
 
 KeyValueWrapper::~KeyValueWrapper()
 {
+  if(QCoreApplication::instance() == NULL) {
+    destroyed_ = true;
+  }
+
   if(destroyed_)
     emit destroyWidgetSignal();
   else

src/realplot/RealplotWrapper.cpp

@@ -38,6 +38,10 @@ RealplotWrapper::RealplotWrapper()
 
 RealplotWrapper::~RealplotWrapper()
 {
+  if(QCoreApplication::instance() == NULL) {
+    destroyed_ = true;
+  }
+
   if(destroyed_)
     emit destroyWidgetSignal();
   else

src/scatterplot/ScatterplotWrapper.cpp

@@ -42,6 +42,10 @@ ScatterplotWrapper::ScatterplotWrapper()
 
 ScatterplotWrapper::~ScatterplotWrapper()
 {
+  if(QCoreApplication::instance() == NULL) {
+    destroyed_ = true;
+  }
+
   if(destroyed_)
     emit destroyWidgetSignal();
   else

src/srsgui++.cpp

@@ -4,14 +4,16 @@
 #include <unistd.h>
 
 pthread_t threadxx;
+QApplication* appxx;
 static int sdrgui_initiatedxx=0;
 
 void *qt_threadxx(void *arg)
 {
   int argc = 1;
   char* argv[] = { const_cast<char *>((char*) arg), NULL };
-  QApplication app(argc, argv);
-  app.exec();
+  appxx = new QApplication(argc, argv);
+  appxx->exec();
+  delete appxx;
   pthread_exit(NULL);
 }
 
@@ -41,8 +43,11 @@ void sdrgui_exit() {
   if(sdrgui_initiatedxx)
   {
     usleep(100000);
-    pthread_cancel(threadxx);
+    if(appxx) {
+        appxx->quit();
+    }
+
     pthread_join(threadxx, NULL);
-	}
+  }
   sdrgui_initiatedxx=0;
 }

src/srsgui.cpp

@@ -5,14 +5,16 @@
 #include <unistd.h>
 
 pthread_t thread;
+QApplication* app;
 static int sdrgui_initiated=0;
 
 void *qt_thread(void *arg)
 {
 	int argc = 1;
 	char* argv[] = { const_cast<char *>((char*) arg), NULL };
-  QApplication app(argc, argv);
-	app.exec();
+    app = new QApplication(argc, argv);
+    app->exec();
+    delete app;
 	pthread_exit(NULL);
 }
 
@@ -43,8 +45,10 @@ void sdrgui_exit()
   if(sdrgui_initiated)
   {
     usleep(100000);
-		pthread_cancel(thread);
-        pthread_join(thread, NULL);
-	}
+    if (app) {
+        app->quit();
+    }
+    pthread_join(thread, NULL);
+  }
   sdrgui_initiated=0;
 }

src/textedit/TextEditWrapper.cpp

@@ -39,6 +39,10 @@ TextEditWrapper::TextEditWrapper()
 
 TextEditWrapper::~TextEditWrapper()
 {
+  if(QCoreApplication::instance() == NULL) {
+    destroyed_ = true;
+  }
+
   if(destroyed_)
     emit destroyWidgetSignal();
   else

src/waterfallplot/WaterfallplotWrapper.cpp

@@ -39,6 +39,10 @@ WaterfallplotWrapper::WaterfallplotWrapper(int numDataPoints, int numRows)
 
 WaterfallplotWrapper::~WaterfallplotWrapper()
 {
+  if(QCoreApplication::instance() == NULL) {
+    destroyed_ = true;
+  }
+
   if(destroyed_)
     emit destroyWidgetSignal();
   else