4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-28 18:56:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed borked wallet

Browse Source
This commit is contained in:
Jaquee 2016-12-16 00:12:27 +01:00
parent 59ba93bbdd
commit d119c27e3f
No known key found for this signature in database
GPG Key ID: 384E52B09F45DC39
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.qml
View File

@ -173,6 +173,7 @@ ApplicationWindow {
function closeWallet() { function closeWallet() {
// Disconnect all listeners // Disconnect all listeners
if (typeof currentWallet !== "undefined" && currentWallet !== null) {
currentWallet.refreshed.disconnect(onWalletRefresh) currentWallet.refreshed.disconnect(onWalletRefresh)
currentWallet.updated.disconnect(onWalletUpdate) currentWallet.updated.disconnect(onWalletUpdate)
currentWallet.newBlock.disconnect(onWalletNewBlock) currentWallet.newBlock.disconnect(onWalletNewBlock)
@ -183,9 +184,9 @@ ApplicationWindow {
middlePanel.paymentClicked.disconnect(handlePayment); middlePanel.paymentClicked.disconnect(handlePayment);
middlePanel.sweepUnmixableClicked.disconnect(handleSweepUnmixable); middlePanel.sweepUnmixableClicked.disconnect(handleSweepUnmixable);
middlePanel.checkPaymentClicked.disconnect(handleCheckPayment); middlePanel.checkPaymentClicked.disconnect(handleCheckPayment);
}
walletManager.closeWalletAsync();
currentWallet = undefined; currentWallet = undefined;
walletManager.closeWalletAsync();
} }
function connectWallet(wallet) { function connectWallet(wallet) {
@ -227,8 +228,6 @@ 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)
closeWallet(); closeWallet();
currentWallet = undefined
// try to open wallet with password; // try to open wallet with password;
passwordDialog.open(wallet.path); passwordDialog.open(wallet.path);
} else { } else {
@ -240,7 +239,6 @@ ApplicationWindow {
informationPopup.icon = StandardIcon.Critical informationPopup.icon = StandardIcon.Critical
console.log("closing wallet async : " + wallet.address) console.log("closing wallet async : " + wallet.address)
closeWallet(); closeWallet();
currentWallet = undefined
informationPopup.open() informationPopup.open()
informationPopup.onCloseCallback = function() { informationPopup.onCloseCallback = function() {
passwordDialog.open(wallet.path) passwordDialog.open(wallet.path)
@ -616,6 +614,7 @@ ApplicationWindow {
walletInitialized = false; walletInitialized = false;
splashCounter = 0; splashCounter = 0;
closeWallet(); closeWallet();
currentWallet = undefined;
wizard.restart(); wizard.restart();
rootItem.state = "wizard" rootItem.state = "wizard"
} }