diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-09-18 17:58:14 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-09-18 17:58:14 +0200 |
| commit | 08f0c60ffc60b5f79b3a529c73072e90af8bda20 (patch) | |
| tree | 4db32f835adc55a9542378a81e7f9880b809ed96 /src/wallet | |
| parent | Merge pull request #4357 (diff) | |
| parent | wallet2: import_multisig forward refresh exception (diff) | |
| download | monero-08f0c60ffc60b5f79b3a529c73072e90af8bda20.tar.xz | |
Merge pull request #4360
7a76354c wallet2: import_multisig forward refresh exception (naughtyfox)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 6ec03ced2..6502463e2 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -10830,7 +10830,12 @@ size_t wallet2::import_multisig(std::vector<cryptonote::blobdata> blobs) refresh(false); } - catch (...) {} + catch (...) + { + m_multisig_rescan_info = NULL; + m_multisig_rescan_k = NULL; + throw; + } m_multisig_rescan_info = NULL; m_multisig_rescan_k = NULL; |