monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-09 12:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2411

Browse source 
965081c DaemonManager: reset disconnectedEpoch on start, start timeout 60s (xiphon)
This commit is contained in:
luigi1111 2019-10-14 17:57:23 -05:00
commit 5e2099ad47
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main.qml
View file

@ -700,6 +700,7 @@ ApplicationWindow {
// resume refresh // resume refresh
currentWallet.startRefresh(); currentWallet.startRefresh();
// resume simplemode connection timer // resume simplemode connection timer
appWindow.disconnectedEpoch = Utils.epoch();
simpleModeConnectionTimer.start(); simpleModeConnectionTimer.start();
} }
function onDaemonStopped(){ function onDaemonStopped(){
@ -1855,7 +1856,6 @@ ApplicationWindow {
appWindow.stopDaemon(); appWindow.stopDaemon();
} }
appWindow.startDaemon(""); appWindow.startDaemon("");
appWindow.disconnectedEpoch = Utils.epoch();
} }
Timer { Timer {

2
src/daemon/DaemonManager.cpp
View file

@ -43,7 +43,7 @@
#include <QMap> #include <QMap>
namespace { namespace {
static const int DAEMON_START_TIMEOUT_SECONDS = 30; static const int DAEMON_START_TIMEOUT_SECONDS = 60;
} }
DaemonManager * DaemonManager::m_instance = nullptr; DaemonManager * DaemonManager::m_instance = nullptr;