diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-08 22:53:13 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-08 22:53:13 +0200 |
| commit | 7c7a6cf2f8b8cb2675f7f2eab972c2db981ac6a8 (patch) | |
| tree | 1de659803d1ea4859e787ddcac54fe8281bb8ce4 /src/wallet/api/wallet.cpp | |
| parent | 96e0138ebfc2bde74d73a33eaf90628df4cb1797 (diff) | |
| parent | 63fe6fd9ba3d7fe56564543b877a962e3c7eea53 (diff) | |
| download | monzero-core-7c7a6cf2f8b8cb2675f7f2eab972c2db981ac6a8.tar.gz monzero-core-7c7a6cf2f8b8cb2675f7f2eab972c2db981ac6a8.tar.xz monzero-core-7c7a6cf2f8b8cb2675f7f2eab972c2db981ac6a8.zip | |
Merge pull request #1302
63fe6fd wallet2_api: allow connection to return "yes, but wrong version" (moneromooo-monero)
Diffstat (limited to 'src/wallet/api/wallet.cpp')
| -rw-r--r-- | src/wallet/api/wallet.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 3c472b410..fb56a347f 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -760,9 +760,15 @@ bool WalletImpl::connectToDaemon() return result; } -bool WalletImpl::connected() const +Wallet::ConnectionStatus WalletImpl::connected() const { - return m_wallet->check_connection(); + bool same_version = false; + bool is_connected = m_wallet->check_connection(&same_version); + if (!is_connected) + return Wallet::ConnectionStatus_Disconnected; + if (!same_version) + return Wallet::ConnectionStatus_WrongVersion; + return Wallet::ConnectionStatus_Connected; } void WalletImpl::setTrustedDaemon(bool arg) |