Merge pull request #2884

c439d68 main: fix local node status check on closing uninitialized wallet (xiphon)
pull/7/head
luigi1111 4 years ago
commit 5bf0dd9684
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

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