aboutsummaryrefslogtreecommitdiff
path: root/wizard/WizardMain.qml
diff options
context:
space:
mode:
authorJaquee <jaquee.monero@gmail.com>2017-01-03 21:44:55 +0100
committerJaquee <jaquee.monero@gmail.com>2017-01-03 22:45:41 +0100
commitba8decca3f06deada9f949542563f85a9b1ef658 (patch)
treec04d52571257e583720a456e504ba923bbc8ea5d /wizard/WizardMain.qml
parentd8f9e7360fdbab910283c465aafe36149b1d7f26 (diff)
downloadmonzero-gui-ba8decca3f06deada9f949542563f85a9b1ef658.tar.gz
monzero-gui-ba8decca3f06deada9f949542563f85a9b1ef658.tar.xz
monzero-gui-ba8decca3f06deada9f949542563f85a9b1ef658.zip
wizard: Ensure temporary wallet files are deleted
Diffstat (limited to 'wizard/WizardMain.qml')
-rw-r--r--wizard/WizardMain.qml17
1 files changed, 6 insertions, 11 deletions
diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml
index dc84a4a4..39232526 100644
--- a/wizard/WizardMain.qml
+++ b/wizard/WizardMain.qml
@@ -174,18 +174,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);
@@ -209,7 +205,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