diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:58:39 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:58:39 -0800 |
| commit | 643772377232ff6211fc47fb1a6f948eb3e5f8ea (patch) | |
| tree | bf5589a353991f0242c2314b323d4900185fa2bd /wizard/WizardMain.qml | |
| parent | 1532c5638f8dc5ceb9f8022a4884f0c7a00a0353 (diff) | |
| parent | ba8decca3f06deada9f949542563f85a9b1ef658 (diff) | |
| download | monzero-gui-643772377232ff6211fc47fb1a6f948eb3e5f8ea.tar.gz monzero-gui-643772377232ff6211fc47fb1a6f948eb3e5f8ea.tar.xz monzero-gui-643772377232ff6211fc47fb1a6f948eb3e5f8ea.zip | |
Merge pull request #383
ba8decc wizard: Ensure temporary wallet files are deleted (Jaquee)
Diffstat (limited to 'wizard/WizardMain.qml')
| -rw-r--r-- | wizard/WizardMain.qml | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml index a905d909..ec720026 100644 --- a/wizard/WizardMain.qml +++ b/wizard/WizardMain.qml @@ -168,18 +168,14 @@ Rectangle { //! actually writes the wallet function applySettings() { - console.log("Here we apply the settings"); - // here we need to actually move wallet to the new location - console.log(settings.wallet_full_path); - + // Save wallet files in user specified location var new_wallet_filename = createWalletPath(settings.wallet_path,settings.account_name) - console.log("saving in wizard: "+ new_wallet_filename) - // moving wallet files to the new destination, if user changed it - if (new_wallet_filename !== settings.wallet_filename) { - // using previously saved wallet; - settings.wallet.store(new_wallet_filename); - } + settings.wallet.store(new_wallet_filename); + + // make sure temporary wallet files are deleted + console.log("Removing temporary wallet: "+ settings.tmp_wallet_filename) + oshelper.removeTemporaryWallet(settings.tmp_wallet_filename) // protecting wallet with password settings.wallet.setPassword(settings.wallet_password); @@ -203,7 +199,6 @@ Rectangle { appWindow.persistentSettings.restore_height = (isNaN(settings.restore_height))? 0 : settings.restore_height appWindow.persistentSettings.is_recovering = (settings.is_recovering === undefined)? false : settings.is_recovering - } // reading settings from persistent storage |