Merge pull request #6304
2e9d1e6
wallet2: fix store-tx-info loading (moneromooo-monero)
This commit is contained in:
commit
f9de65b546
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue