Merge pull request #2884

c439d68 main: fix local node status check on closing uninitialized wallet (xiphon)
This commit is contained in:
luigi1111 2020-05-07 10:31:35 -05:00
commit 5bf0dd9684
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -1979,15 +1979,27 @@ ApplicationWindow {
} }
// If daemon is running - prompt user before exiting // If daemon is running - prompt user before exiting
if(typeof daemonManager != "undefined" && daemonRunning) { if(daemonManager == undefined || persistentSettings.useRemoteNode) {
if (appWindow.walletMode == 0) { closeAccepted();
} else if (appWindow.walletMode == 0) {
stopDaemon(closeAccepted); stopDaemon(closeAccepted);
} else { } else {
showProcessingSplash(qsTr("Checking local node status..."));
const handler = function(running) {
hideProcessingSplash();
if (running) {
showDaemonIsRunningDialog(closeAccepted); showDaemonIsRunningDialog(closeAccepted);
}
} else { } else {
closeAccepted(); closeAccepted();
} }
};
if (currentWallet) {
handler(!currentWallet.disconnected);
} else {
daemonManager.runningAsync(persistentSettings.nettype, handler);
}
}
} }
function closeAccepted(){ function closeAccepted(){