monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 20:20:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

async close: make sure curretWallet isn't used after shutdown started

Browse source
This commit is contained in:
Jaquee 2016-12-14 13:11:20 +01:00
parent eb97bda3a3
commit 7fd80a1be2
No known key found for this signature in database
GPG key ID: 384E52B09F45DC39
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
main.qml
View file

@ -135,6 +135,7 @@ ApplicationWindow {
if (typeof currentWallet !== "undefined" && currentWallet !== null) { if (typeof currentWallet !== "undefined" && currentWallet !== null) {
console.log("Daemon change - closing " + currentWallet) console.log("Daemon change - closing " + currentWallet)
walletManager.closeWalletAsync(); walletManager.closeWalletAsync();
currentWallet = undefined
} else { } else {
// set page to transfer if not changing daemon // set page to transfer if not changing daemon
@ -221,6 +222,8 @@ ApplicationWindow {
console.error("Error opening wallet with empty password: ", wallet.errorString); console.error("Error opening wallet with empty password: ", wallet.errorString);
console.log("closing wallet async : " + wallet.address) console.log("closing wallet async : " + wallet.address)
walletManager.closeWalletAsync() walletManager.closeWalletAsync()
currentWallet = undefined
// try to open wallet with password; // try to open wallet with password;
passwordDialog.open(wallet.path); passwordDialog.open(wallet.path);
} else { } else {
@ -232,6 +235,7 @@ ApplicationWindow {
informationPopup.icon = StandardIcon.Critical informationPopup.icon = StandardIcon.Critical
console.log("closing wallet async : " + wallet.address) console.log("closing wallet async : " + wallet.address)
walletManager.closeWalletAsync(); walletManager.closeWalletAsync();
currentWallet = undefined
informationPopup.open() informationPopup.open()
informationPopup.onCloseCallback = function() { informationPopup.onCloseCallback = function() {
passwordDialog.open(wallet.path) passwordDialog.open(wallet.path)
@ -612,6 +616,7 @@ ApplicationWindow {
walletInitialized = false; walletInitialized = false;
splashCounter = 0; splashCounter = 0;
walletManager.closeWalletAsync(); walletManager.closeWalletAsync();
currentWallet = undefined
wizard.restart(); wizard.restart();
rootItem.state = "wizard" rootItem.state = "wizard"
} }