Merge pull request #2411

965081c DaemonManager: reset disconnectedEpoch on start, start timeout 60s (xiphon)
This commit is contained in:
luigi1111
2019-10-14 17:57:23 -05:00
2 changed files with 2 additions and 2 deletions

View File

@@ -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 {

View File

@@ -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;