forked from Public/monero-gui
DaemonManager: async stop, simple mode wizard - show splash on stop
This commit is contained in:
15
main.qml
15
main.qml
@@ -678,9 +678,12 @@ ApplicationWindow {
|
||||
daemonManager.start(flags, persistentSettings.nettype, persistentSettings.blockchainDataDir, persistentSettings.bootstrapNodeAddress, noSync);
|
||||
}
|
||||
|
||||
function stopDaemon(){
|
||||
function stopDaemon(callback){
|
||||
appWindow.showProcessingSplash(qsTr("Waiting for daemon to stop..."))
|
||||
daemonManager.stop(persistentSettings.nettype);
|
||||
daemonManager.stopAsync(persistentSettings.nettype, function(result) {
|
||||
hideProcessingSplash();
|
||||
callback(result);
|
||||
});
|
||||
}
|
||||
|
||||
function onDaemonStarted(){
|
||||
@@ -694,8 +697,6 @@ ApplicationWindow {
|
||||
simpleModeConnectionTimer.start();
|
||||
}
|
||||
function onDaemonStopped(){
|
||||
console.log("daemon stopped");
|
||||
hideProcessingSplash();
|
||||
currentWallet.connected(true);
|
||||
}
|
||||
|
||||
@@ -1927,8 +1928,7 @@ ApplicationWindow {
|
||||
onClose();
|
||||
}
|
||||
confirmationDialog.onRejectedCallback = function() {
|
||||
daemonManager.stop(persistentSettings.nettype);
|
||||
onClose();
|
||||
stopDaemon(onClose);
|
||||
};
|
||||
confirmationDialog.open();
|
||||
}
|
||||
@@ -1955,8 +1955,7 @@ ApplicationWindow {
|
||||
// If daemon is running - prompt user before exiting
|
||||
if(typeof daemonManager != "undefined" && daemonRunning) {
|
||||
if (appWindow.walletMode == 0) {
|
||||
stopDaemon();
|
||||
closeAccepted();
|
||||
stopDaemon(closeAccepted);
|
||||
} else {
|
||||
showDaemonIsRunningDialog(closeAccepted);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user