Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Merge pull request #383

Browse Source 
ba8decc wizard: Ensure temporary wallet files are deleted (Jaquee)
This commit is contained in:
Riccardo Spagni
2017-01-08 16:58:39 -08:00
parent 1532c5638f ba8decca3f
commit 6437723772
5 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wizard/WizardMain.qml
View File

@@ -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