diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-03-21 14:51:30 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-03-21 14:51:30 +0200 |
| commit | dcfd5a88927f6a4a59c5fb5f7ebec9484cdf32e0 (patch) | |
| tree | c1e5efe5bb3ff2dc1bcf8e67374bbb0e8a71d740 /src/wallet | |
| parent | Merge pull request #5263 (diff) | |
| parent | wallet: fix load failure if the mms isn't usable (diff) | |
| download | monero-dcfd5a88927f6a4a59c5fb5f7ebec9484cdf32e0.tar.xz | |
Merge pull request #5266
576116d4 wallet: fix load failure if the mms isn't usable (moneromooo-monero)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 5e862df06..6036154ac 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -5120,7 +5120,14 @@ void wallet2::load(const std::string& wallet_, const epee::wipeable_string& pass MERROR("Failed to save rings, will try again next time"); } - m_message_store.read_from_file(get_multisig_wallet_state(), m_mms_file); + try + { + 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() |