aboutsummaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-07-12 20:34:10 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-07-12 20:34:10 -0500
commit79dcb92d182908bf2caba6fc56cacf4548266871 (patch)
tree78041e39ab1dd12b3ad646c2e3b8ef194646e1ba /pages
parent8bbc2e87bc19b6cbdf4cb2fe54395cb95290dfeb (diff)
parentab9e31e7cc5ab68a8291ff6ee1aa6d423484eea0 (diff)
downloadmonzero-gui-79dcb92d182908bf2caba6fc56cacf4548266871.tar.gz
monzero-gui-79dcb92d182908bf2caba6fc56cacf4548266871.tar.xz
monzero-gui-79dcb92d182908bf2caba6fc56cacf4548266871.zip
Merge pull request #2247
ab9e31e WalletManager: async close with splash screen (xiphon)
Diffstat (limited to 'pages')
-rw-r--r--pages/settings/SettingsInfo.qml9
1 files changed, 5 insertions, 4 deletions
diff --git a/pages/settings/SettingsInfo.qml b/pages/settings/SettingsInfo.qml
index b329c068..938bd122 100644
--- a/pages/settings/SettingsInfo.qml
+++ b/pages/settings/SettingsInfo.qml
@@ -208,10 +208,11 @@ Rectangle {
confirmationDialog.icon = StandardIcon.Question
confirmationDialog.cancelText = qsTr("Cancel")
confirmationDialog.onAcceptedCallback = function() {
- walletManager.closeWallet();
- walletManager.clearWalletCache(persistentSettings.wallet_path);
- walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.walletPassword,
- persistentSettings.nettype, persistentSettings.kdfRounds);
+ appWindow.closeWallet(function() {
+ walletManager.clearWalletCache(persistentSettings.wallet_path);
+ walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.walletPassword,
+ persistentSettings.nettype, persistentSettings.kdfRounds);
+ });
}
confirmationDialog.onRejectedCallback = null;