diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-03-31 15:13:19 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-03-31 15:13:19 -0500 |
| commit | f9de65b546f5b7a33b5cef9f676b3a42a9379dd9 (patch) | |
| tree | a92c786cf22a2b9abf61c10318b73ec9f444a60a | |
| parent | Merge pull request #6302 (diff) | |
| parent | wallet2: fix store-tx-info loading (diff) | |
| download | monero-f9de65b546f5b7a33b5cef9f676b3a42a9379dd9.tar.xz | |
Merge pull request #6304
2e9d1e6 wallet2: fix store-tx-info loading (moneromooo-monero)
| -rw-r--r-- | src/wallet/wallet2.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 5c9463bc7..6d2fff17b 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -4097,9 +4097,18 @@ bool wallet2::load_keys(const std::string& keys_file_name, const epee::wipeable_ m_always_confirm_transfers = field_always_confirm_transfers; GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, print_ring_members, int, Int, false, true); m_print_ring_members = field_print_ring_members; - GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, store_tx_keys, int, Int, false, true); - GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, store_tx_info, int, Int, false, true); - m_store_tx_info = ((field_store_tx_keys != 0) || (field_store_tx_info != 0)); + if (json.HasMember("store_tx_info")) + { + GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, store_tx_info, int, Int, true, true); + m_store_tx_info = field_store_tx_info; + } + else if (json.HasMember("store_tx_keys")) // backward compatibility + { + GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, store_tx_keys, int, Int, true, true); + m_store_tx_info = field_store_tx_keys; + } + else + m_store_tx_info = true; GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, default_mixin, unsigned int, Uint, false, 0); m_default_mixin = field_default_mixin; GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, default_priority, unsigned int, Uint, false, 0); |