crash fix

3 files changed, 15 insertions, 8 deletions

diff --git a/src/app.cpp b/src/app.cpp
index e20de4a..b778cac 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -10,11 +10,11 @@
 #include <QtQml/qqml.h>
 
 
-/* static member variables */
 App *theApp;
 Settings *theSettings;
 QQuickWindow *theWindow;
 
+
 App::App (QObject * parent)
   : QObject (parent)
 {
@@ -33,12 +33,17 @@ App::App (QObject * parent)
 
 App::~App ()
 {
+  delete m_qrProvider;
+
+  theApp = NULL;
+  theSettings = NULL;
+  theWindow = NULL;
 }
 
 
 /**
  * Connect to GNUnet services.
- * It needs to run in a separate thread.
+ * GNUnet operations take place in a separate thread.
  */
 void
 App::startGnuNet ()
diff --git a/src/app.h b/src/app.h
index 8bfa4fa..ba7806d 100644
--- a/src/app.h
+++ b/src/app.h
@@ -108,6 +108,7 @@ private:
   void setTrayMessage (QString place, QString message);
 };
 
+
 // externals visible to the whole application (globals)
 
 extern App *theApp;
diff --git a/src/main.cpp b/src/main.cpp
index 986d12b..6e0a415 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,12 +16,13 @@ main (int argc, char **argv)
   QApplication qapp (argc, argv);
 
   // start our core application object
-  App app;
+  App *app = new App ();
 
-  QQmlApplicationEngine engine (QUrl (QStringLiteral ("qrc:///qml/main.qml")));
+  QQmlApplicationEngine *
+    engine = new QQmlApplicationEngine (QUrl (QStringLiteral ("qrc:///qml/main.qml")));
 
   // connect window to quit signal
-  QObject *topLevel = engine.rootObjects ().value (0);
+  QObject *topLevel = engine->rootObjects ().value (0);
   theWindow = qobject_cast < QQuickWindow * >(topLevel);
   if (!theWindow)
   {
@@ -29,10 +30,10 @@ main (int argc, char **argv)
     return -1;
   }
 
-  QObject::connect (&engine, SIGNAL (quit ()),
-                    &app, SLOT (close ()));
+  QObject::connect (engine, SIGNAL (quit ()),
+                    app, SLOT (close ()));
 
-  app.registerImageProvider (&engine);
+  app->registerImageProvider (engine);
 
   theWindow->setTitle (QString ("secushare 0.1"));
   theWindow->setIcon (QIcon (":/assets/icon.ico"));