diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-24 16:04:13 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-24 16:04:13 +0200 |
| commit | 2ca2376d45224f02bba54059b219abf4de679b36 (patch) | |
| tree | 75150695f2d5b2a2c8a4b52d94f39173dd992e91 /src/libwalletqt | |
| parent | 6120013ae2bdd195d7b0e71fb2a276490db26efb (diff) | |
| parent | faacd3d6a11efcb6dcf9a54ce55ed20e573b40f5 (diff) | |
| download | monzero-gui-2ca2376d45224f02bba54059b219abf4de679b36.tar.gz monzero-gui-2ca2376d45224f02bba54059b219abf4de679b36.tar.xz monzero-gui-2ca2376d45224f02bba54059b219abf4de679b36.zip | |
Merge pull request #486
faacd3d start daemon automatically and detached (Jaquee)
Diffstat (limited to 'src/libwalletqt')
| -rw-r--r-- | src/libwalletqt/Wallet.cpp | 3 | ||||
| -rw-r--r-- | src/libwalletqt/Wallet.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 5780a93b..8913d4c3 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -20,7 +20,7 @@ #include <QMutexLocker> namespace { - static const int DAEMON_BLOCKCHAIN_HEIGHT_CACHE_TTL_SECONDS = 10; + static const int DAEMON_BLOCKCHAIN_HEIGHT_CACHE_TTL_SECONDS = 5; static const int DAEMON_BLOCKCHAIN_TARGET_HEIGHT_CACHE_TTL_SECONDS = 60; static const int WALLET_CONNECTION_STATUS_CACHE_TTL_SECONDS = 5; } @@ -118,6 +118,7 @@ void Wallet::updateConnectionStatusAsync() if (newStatus != m_connectionStatus || !m_initialized) { m_initialized = true; m_connectionStatus = newStatus; + qDebug() << "NEW STATUS " << newStatus; emit connectionStatusChanged(newStatus); } // Release lock diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h index 7e9651e4..a11cabe9 100644 --- a/src/libwalletqt/Wallet.h +++ b/src/libwalletqt/Wallet.h @@ -28,7 +28,7 @@ class Wallet : public QObject Q_PROPERTY(QString seedLanguage READ getSeedLanguage) Q_PROPERTY(Status status READ status) Q_PROPERTY(bool testnet READ testnet) - Q_PROPERTY(ConnectionStatus connected READ connected) +// Q_PROPERTY(ConnectionStatus connected READ connected) Q_PROPERTY(bool synchronized READ synchronized) Q_PROPERTY(QString errorString READ errorString) Q_PROPERTY(QString address READ address) @@ -77,7 +77,7 @@ public: bool testnet() const; //! returns whether the wallet is connected, and version status - ConnectionStatus connected(bool forceCheck = false); + Q_INVOKABLE ConnectionStatus connected(bool forceCheck = false); void updateConnectionStatusAsync(); //! returns true if wallet was ever synchronized |