Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-11-29 23:06:34 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1302

Browse source 
63fe6fd wallet2_api: allow connection to return "yes, but wrong version" (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-11-08 22:53:13 +02:00
commit 7c7a6cf2f8
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/wallet/api/wallet.cpp
View file

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