main: don't attempt to close already closed wallet

monero-project · Aug 6, 2019 · f666e6f · f666e6f
1 parent 0461a28
commit f666e6f
Showing 1 changed file with 22 additions and 19 deletions.
diff --git a/main.qml b/main.qml
@@ -239,7 +239,6 @@ ApplicationWindow {
         if (typeof currentWallet !== "undefined" && currentWallet !== null) {
             console.log("Daemon change - closing " + currentWallet)
             closeWallet();
-            currentWallet = undefined
         } else if (!walletInitialized) {
             // set page to transfer if not changing daemon
             middlePanel.state = "Transfer";
@@ -286,25 +285,30 @@ ApplicationWindow {
     function closeWallet(callback) {
 
         // Disconnect all listeners
-        if (typeof currentWallet !== "undefined" && currentWallet !== null) {
+        if (typeof currentWallet === "undefined" || currentWallet === null) {
-            currentWallet.heightRefreshed.disconnect(onHeightRefreshed);
+            if (callback) {
-            currentWallet.refreshed.disconnect(onWalletRefresh)
+                callback();
-            currentWallet.updated.disconnect(onWalletUpdate)
+            }
-            currentWallet.newBlock.disconnect(onWalletNewBlock)
+            return;
-            currentWallet.moneySpent.disconnect(onWalletMoneySent)
-            currentWallet.moneyReceived.disconnect(onWalletMoneyReceived)
-            currentWallet.unconfirmedMoneyReceived.disconnect(onWalletUnconfirmedMoneyReceived)
-            currentWallet.transactionCreated.disconnect(onTransactionCreated)
-            currentWallet.connectionStatusChanged.disconnect(onWalletConnectionStatusChanged)
-            currentWallet.deviceButtonRequest.disconnect(onDeviceButtonRequest);
-            currentWallet.deviceButtonPressed.disconnect(onDeviceButtonPressed);
-            currentWallet.transactionCommitted.disconnect(onTransactionCommitted);
-            middlePanel.paymentClicked.disconnect(handlePayment);
-            middlePanel.sweepUnmixableClicked.disconnect(handleSweepUnmixable);
-            middlePanel.getProofClicked.disconnect(handleGetProof);
-            middlePanel.checkProofClicked.disconnect(handleCheckProof);
         }
 
+        currentWallet.heightRefreshed.disconnect(onHeightRefreshed);
+        currentWallet.refreshed.disconnect(onWalletRefresh)
+        currentWallet.updated.disconnect(onWalletUpdate)
+        currentWallet.newBlock.disconnect(onWalletNewBlock)
+        currentWallet.moneySpent.disconnect(onWalletMoneySent)
+        currentWallet.moneyReceived.disconnect(onWalletMoneyReceived)
+        currentWallet.unconfirmedMoneyReceived.disconnect(onWalletUnconfirmedMoneyReceived)
+        currentWallet.transactionCreated.disconnect(onTransactionCreated)
+        currentWallet.connectionStatusChanged.disconnect(onWalletConnectionStatusChanged)
+        currentWallet.deviceButtonRequest.disconnect(onDeviceButtonRequest);
+        currentWallet.deviceButtonPressed.disconnect(onDeviceButtonPressed);
+        currentWallet.transactionCommitted.disconnect(onTransactionCommitted);
+        middlePanel.paymentClicked.disconnect(handlePayment);
+        middlePanel.sweepUnmixableClicked.disconnect(handleSweepUnmixable);
+        middlePanel.getProofClicked.disconnect(handleGetProof);
+        middlePanel.checkProofClicked.disconnect(handleCheckProof);
+
         currentWallet = undefined;
 
         appWindow.showProcessingSplash(qsTr("Closing wallet..."));
@@ -1122,7 +1126,6 @@ ApplicationWindow {
         clearMoneroCardLabelText();
         walletInitialized = false;
         closeWallet(function() {
-            currentWallet = undefined;
             wizard.restart();
             wizard.wizardState = "wizardHome";
             rootItem.state = "wizard"