rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 19:33:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

wallet: fix load failure if the mms isn't usable

Browse Source
This commit is contained in:
moneromooo-monero 2019-03-11 16:11:48 +00:00
parent 1d1a02e9f9
commit 576116d415
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/simplewallet/simplewallet.cpp
View File

@ -9952,6 +9952,16 @@ void simple_wallet::mms_auto_config(const std::vector<std::string> &args)
bool simple_wallet::mms(const std::vector<std::string> &args) bool simple_wallet::mms(const std::vector<std::string> &args)
{ {
try
{
m_wallet->get_multisig_wallet_state();
}
catch(const std::exception &e)
{
fail_msg_writer() << tr("MMS not available in this wallet");
return true;
}
try try
{ {
mms::message_store& ms = m_wallet->get_message_store(); mms::message_store& ms = m_wallet->get_message_store();

7
src/wallet/wallet2.cpp
View File

@ -5085,8 +5085,15 @@ void wallet2::load(const std::string& wallet_, const epee::wipeable_string& pass
MERROR("Failed to save rings, will try again next time"); MERROR("Failed to save rings, will try again next time");
} }
try
{
m_message_store.read_from_file(get_multisig_wallet_state(), m_mms_file); m_message_store.read_from_file(get_multisig_wallet_state(), m_mms_file);
} }
catch (const std::exception &e)
{
MERROR("Failed to initialize MMS, it will be unusable");
}
}
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
void wallet2::trim_hashchain() void wallet2::trim_hashchain()
{ {