aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-09-18 17:58:14 +0200
committerRiccardo Spagni <ric@spagni.net>2018-09-18 17:58:14 +0200
commit08f0c60ffc60b5f79b3a529c73072e90af8bda20 (patch)
tree4db32f835adc55a9542378a81e7f9880b809ed96
parentMerge pull request #4357 (diff)
parentwallet2: import_multisig forward refresh exception (diff)
downloadmonero-08f0c60ffc60b5f79b3a529c73072e90af8bda20.tar.xz
Merge pull request #4360
7a76354c wallet2: import_multisig forward refresh exception (naughtyfox)
-rw-r--r--src/wallet/wallet2.cpp7
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;