Merge pull request #185

708eb43 Fix crash on exit if cancelling open and exiting (moneromooo.monero)

1 files changed, 8 insertions, 2 deletions

diff --git a/main.qml b/main.qml
index 7e84b4af..a4bc66b3 100644
--- a/main.qml
+++ b/main.qml
@@ -603,7 +603,10 @@ ApplicationWindow {
         walletInitialized = false;
         splashCounter = 0;
         // we can't close async here. Gui crashes if wallet is open
-        walletManager.closeWallet(currentWallet);
+        if (currentWallet != undefined) {
+            walletManager.closeWallet(currentWallet);
+            currentWallet = undefined
+        }
         wizard.restart();
         rootItem.state = "wizard"
 
@@ -1026,6 +1029,9 @@ ApplicationWindow {
     }
     onClosing: {
        // Close and save to disk on app close
-       walletManager.closeWallet(currentWallet);
+       if (currentWallet != undefined) {
+           walletManager.closeWallet(currentWallet);
+           currentWallet = undefined
+       }
     }
 }