1 files changed, 8 insertions, 0 deletions
diff --git a/main.cpp b/main.cpp
index 21ab9da5..ebae384f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -31,6 +31,7 @@
 #include <QtQml>
 #include <QStandardPaths>
 #include <QDebug>
+#include <QObject>
 #include "clipboardAdapter.h"
 #include "filter.h"
 #include "oscursor.h"
@@ -110,6 +111,13 @@ int main(int argc, char *argv[])
 
     engine.rootContext()->setContextProperty("daemonManager", DaemonManager::instance(QCoreApplication::arguments()));
 
+    DaemonManager * daemonManager = DaemonManager::instance(QCoreApplication::arguments());
+    QObject::connect(&app, SIGNAL(aboutToQuit()), daemonManager, SLOT(closing()));
+    engine.rootContext()->setContextProperty("daemonManager", daemonManager);
+
+
+>>>>>>> cc05e1a... Shutdown daemon and close wallet properly on app exit
+
 //  export to QML monero accounts root directory
 //  wizard is talking about where
 //  to save the wallet file (.keys, .bin), they have to be user-accessible for