diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-11-15 10:48:09 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-11-15 10:48:09 +0200 |
| commit | 2751a477d87cb01bebec699750b8b4b5c9d77d55 (patch) | |
| tree | 7ffa9c21c8660dea56eb1c494fe74f884e94fd62 | |
| parent | Merge pull request #2814 (diff) | |
| parent | wallet2 bugfix: loading old m_unconfirmed_payments (diff) | |
| download | monero-2751a477d87cb01bebec699750b8b4b5c9d77d55.tar.xz | |
Merge pull request #2816
a17b8233 wallet2 bugfix: loading old m_unconfirmed_payments (stoffu)
| -rw-r--r-- | src/wallet/wallet2.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index b07295253..38898930d 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -610,14 +610,13 @@ namespace tools a & m_address_book; if(ver < 17) return; - if (ver < 21) + if (ver < 22) { // we're loading an old version, where m_unconfirmed_payments payload was payment_details - std::unordered_map<crypto::hash, payment_details> m; + std::unordered_multimap<crypto::hash, payment_details> m; a & m; for (const auto &i: m) m_unconfirmed_payments.insert(std::make_pair(i.first, pool_payment_details{i.second, false})); - return; } if(ver < 18) return; |