Moving wallet to the user defined location at the "donation" page (pre-

final)

2 files changed, 17 insertions, 12 deletions

diff --git a/wizard/WizardCreateWallet.qml b/wizard/WizardCreateWallet.qml
index 653db251..2332dd5c 100644
--- a/wizard/WizardCreateWallet.qml
+++ b/wizard/WizardCreateWallet.qml
@@ -49,19 +49,7 @@ Item {
 
         // put wallet files to the subdirectory with the same name as
         // wallet name
-        var new_wallet_filename = settingsObject.wallet_path + "/"
-                + settingsObject.account_name + "/"
-                + settingsObject.account_name;
 
-        // moving wallet files to the new destination, if user changed it
-        if (new_wallet_filename !== settingsObject.wallet_filename) {
-            // using previously saved wallet;
-            settingsObject.wallet.store(new_wallet_filename);
-            //walletManager.moveWallet(settingsObject.wallet_filename, new_wallet_filename);
-        }
-
-        // saving wallet_filename;
-        settingsObject['wallet_filename'] = new_wallet_filename;
     }
 
     //! function called each time we hide this page
diff --git a/wizard/WizardDonation.qml b/wizard/WizardDonation.qml
index 51a28029..8cfc68f2 100644
--- a/wizard/WizardDonation.qml
+++ b/wizard/WizardDonation.qml
@@ -42,6 +42,23 @@ Item {
         settingsObject['auto_donations_enabled'] = enableAutoDonationCheckBox.checked;
         settingsObject['auto_donations_amount']  = autoDonationAmountText.text;
         settingsObject['allow_background_mining'] = allowBackgroundMiningCheckBox.checked;
+
+        // here we need to actually move wallet to the new location
+        // put wallet files to the subdirectory with the same name as
+        // wallet name
+        var new_wallet_filename = settingsObject.wallet_path + "/"
+                + settingsObject.account_name + "/"
+                + settingsObject.account_name;
+
+        // moving wallet files to the new destination, if user changed it
+        if (new_wallet_filename !== settingsObject.wallet_filename) {
+            // using previously saved wallet;
+            settingsObject.wallet.store(new_wallet_filename);
+            //walletManager.moveWallet(settingsObject.wallet_filename, new_wallet_filename);
+        }
+
+        // saving wallet_filename;
+        settingsObject['wallet_filename'] = new_wallet_filename;
     }
 
     Row {