Merge pull request #2118

e6a8fcd Clean up m_wallet before opening new wallets (xmrdsc)

1 files changed, 11 insertions, 0 deletions

diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
index c1fccc81..a317e544 100644
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -51,6 +51,9 @@ Rectangle {
     signal walletCreatedFromDevice(bool success)
 
     function restart() {
+        // Clear up any state, including `m_wallet`, which
+        // is the temp. wallet object whilst creating new wallets.
+        // This function is called automatically by navigating to `wizardHome`.
         wizardStateView.state = "wizardHome"
         wizardController.walletOptionsName = defaultAccountName;
         wizardController.walletOptionsLocation = '';
@@ -71,6 +74,11 @@ Rectangle {
         wizardController.walletOptionsSubaddressLookahead = '';
         wizardController.remoteNodes = {};
         disconnect();
+
+        if (typeof wizardController.m_wallet !== 'undefined'){
+            walletManager.closeWallet();
+            wizardController.m_wallet = undefined;
+        }
     }
 
     property var m_wallet;
@@ -164,6 +172,9 @@ Rectangle {
                }
             }
 
+            if(previousView !== null && currentView.viewName === "wizardHome")
+                wizardController.restart();
+
             if (currentView) {
                 stackView.replace(currentView)
                 // Calls when view is opened