Merge pull request #2411

965081c DaemonManager: reset disconnectedEpoch on start, start timeout 60s (xiphon)

2 files changed, 2 insertions, 2 deletions

diff --git a/main.qml b/main.qml
index 74e86a0c..8bfc21b6 100644
--- 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 {
diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp
index baabffb4..e043f225 100644
--- 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;