Merge pull request #2411

965081c DaemonManager: reset disconnectedEpoch on start, start timeout 60s (xiphon)
5 years ago · 5e2099ad47
parent 44280d1e52 965081c554
commit 5e2099ad47
2 changed files with 2 additions and 2 deletions
--- a/main.qml
+++ b/main.qml
@ -700,6 +700,7 @@ ApplicationWindow {
        // resume refresh
        currentWallet.startRefresh();
        // resume simplemode connection timer
+        appWindow.disconnectedEpoch = Utils.epoch();
        simpleModeConnectionTimer.start();
    }
    function onDaemonStopped(){
@ -1855,7 +1856,6 @@ ApplicationWindow {
            appWindow.stopDaemon();
        }
        appWindow.startDaemon("");
-        appWindow.disconnectedEpoch = Utils.epoch();
    }

    Timer {
--- a/src/daemon/DaemonManager.cpp
+++ b/src/daemon/DaemonManager.cpp
@ -43,7 +43,7 @@
 #include <QMap>

 namespace {
-    static const int DAEMON_START_TIMEOUT_SECONDS = 30;
+    static const int DAEMON_START_TIMEOUT_SECONDS = 60;
 }

 DaemonManager * DaemonManager::m_instance = nullptr;