Merge pull request #3788

008a38a main: verify if currentWallet is loaded before calling it (rating89us)

1 files changed, 8 insertions, 4 deletions

diff --git a/main.qml b/main.qml
index af28f2c1..f856539a 100644
--- a/main.qml
+++ b/main.qml
@@ -730,14 +730,18 @@ ApplicationWindow {
     function onDaemonStarted(){
         console.log("daemon started");
         daemonStartStopInProgress = 0;
-        currentWallet.connected(true);
-        // resume refresh
-        currentWallet.startRefresh();
+        if (currentWallet) {
+            currentWallet.connected(true);
+            // resume refresh
+            currentWallet.startRefresh();
+        }
         // resume simplemode connection timer
         appWindow.disconnectedEpoch = Utils.epoch();
     }
     function onDaemonStopped(){
-        currentWallet.connected(true);
+        if (currentWallet) {
+            currentWallet.connected(true);
+        }
     }
 
     function onDaemonStartFailure(error) {