gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-23 07:29:11 -08:00
Code Issues Packages Projects Releases 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
parent 96e0138ebf 63fe6fd9ba
commit 7c7a6cf2f8
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)