nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device: set device name correctly if key_on_device is set

Browse Source
This commit is contained in:
Dusan Klinec 2018-09-27 00:43:13 +02:00
parent 8bf5a00564
commit 06d05c21eb
No known key found for this signature in database
GPG Key ID: 6337E118CCBCE103
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wallet/wallet2.cpp
View File

@ -3282,9 +3282,16 @@ bool wallet2::load_keys(const std::string& keys_file_name, const epee::wipeable_
encrypted_secret_keys = field_encrypted_secret_keys;
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, device_name, std::string, String, false, std::string());
if (m_device_name.empty() && field_device_name_found)
if (m_device_name.empty())
{
m_device_name = field_device_name;
if (field_device_name_found)
{
m_device_name = field_device_name;
}
else
{
m_device_name = m_key_device_type == hw::device::device_type::LEDGER ? "Ledger" : "default";
}
}
}
else