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

Merge pull request #2118

Browse Source 
e6a8fcd Clean up m_wallet before opening new wallets (xmrdsc)
This commit is contained in:
luigi1111 2019-04-28 22:02:44 -05:00
commit 002404227f
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wizard/WizardController.qml
View File

@ -51,6 +51,9 @@ Rectangle {
signal walletCreatedFromDevice(bool success) signal walletCreatedFromDevice(bool success)
function restart() { function restart() {
// Clear up any state, including `m_wallet`, which
// is the temp. wallet object whilst creating new wallets.
// This function is called automatically by navigating to `wizardHome`.
wizardStateView.state = "wizardHome" wizardStateView.state = "wizardHome"
wizardController.walletOptionsName = defaultAccountName; wizardController.walletOptionsName = defaultAccountName;
wizardController.walletOptionsLocation = ''; wizardController.walletOptionsLocation = '';
@ -71,6 +74,11 @@ Rectangle {
wizardController.walletOptionsSubaddressLookahead = ''; wizardController.walletOptionsSubaddressLookahead = '';
wizardController.remoteNodes = {}; wizardController.remoteNodes = {};
disconnect(); disconnect();
if (typeof wizardController.m_wallet !== 'undefined'){
walletManager.closeWallet();
wizardController.m_wallet = undefined;
}
} }
property var m_wallet; property var m_wallet;
@ -164,6 +172,9 @@ Rectangle {
} }
} }
if(previousView !== null && currentView.viewName === "wizardHome")
wizardController.restart();
if (currentView) { if (currentView) {
stackView.replace(currentView) stackView.replace(currentView)
// Calls when view is opened // Calls when view is opened