mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-23 04:44:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4574

Browse Source 
a04d68f6 SOFTWARE is the default wallet device (m2049r)
This commit is contained in:
Riccardo Spagni
2018-10-15 13:50:21 +02:00
parent 8beb3cd2a1 a04d68f698
commit 6834ce6de2
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/wallet/wallet2.cpp
View File

@@ -3611,6 +3611,7 @@ bool wallet2::query_device(hw::device::device_type& device_type, const std::stri
if (json.Parse(account_data.c_str()).HasParseError() || !json.IsObject())
crypto::chacha8(keys_file_data.account_data.data(), keys_file_data.account_data.size(), key, keys_file_data.iv, &account_data[0]);
device_type = hw::device::device_type::SOFTWARE;
// The contents should be JSON if the wallet follows the new format.
if (json.Parse(account_data.c_str()).HasParseError())
{