mirror of
https://github.com/monero-project/monero-gui.git
synced 2025-02-24 10:40:55 +02:00
Merge pull request #2884
c439d68
main: fix local node status check on closing uninitialized wallet (xiphon)
This commit is contained in:
commit
5bf0dd9684
26
main.qml
26
main.qml
@ -1979,14 +1979,26 @@ 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) {
|
|
||||||
stopDaemon(closeAccepted);
|
|
||||||
} else {
|
|
||||||
showDaemonIsRunningDialog(closeAccepted);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
closeAccepted();
|
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 {
|
||||||
|
daemonManager.runningAsync(persistentSettings.nettype, handler);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user