diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-04 22:01:49 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-04 22:01:49 +0200 |
| commit | fe89782512cf98e6c4f1b847887f4c88b4c01eaa (patch) | |
| tree | 7d0bcdcef1120dde2bf6c7456692e62d018a4790 /src/wallet/api/wallet.cpp | |
| parent | Merge pull request #1378 (diff) | |
| parent | Improve daemon RPC version handling (diff) | |
| download | monero-fe89782512cf98e6c4f1b847887f4c88b4c01eaa.tar.xz | |
Merge pull request #1379
d6086f5b Improve daemon RPC version handling (moneromooo-monero)
Diffstat (limited to 'src/wallet/api/wallet.cpp')
| -rw-r--r-- | src/wallet/api/wallet.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 215b61aef..8514abfcd 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -906,11 +906,11 @@ bool WalletImpl::connectToDaemon() Wallet::ConnectionStatus WalletImpl::connected() const { - bool same_version = false; - bool is_connected = m_wallet->check_connection(&same_version); + uint32_t version = 0; + bool is_connected = m_wallet->check_connection(&version); if (!is_connected) return Wallet::ConnectionStatus_Disconnected; - if (!same_version) + if ((version >> 16) != CORE_RPC_VERSION_MAJOR) return Wallet::ConnectionStatus_WrongVersion; return Wallet::ConnectionStatus_Connected; } |