Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4456 

06d05c21 device: set device name correctly if key_on_device is set (Dusan Klinec)
This commit is contained in:
Riccardo Spagni 2018-09-29 22:15:52 +02:00
parent a5476f82ca 06d05c21eb
commit 67e6c4370b
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wallet/wallet2.cpp
View File

@ -3282,10 +3282,17 @@ bool wallet2::load_keys(const std::string& keys_file_name, const epee::wipeable_
encrypted_secret_keys = field_encrypted_secret_keys; encrypted_secret_keys = field_encrypted_secret_keys;
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, device_name, std::string, String, false, std::string()); 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())
{
if (field_device_name_found)
{ {
m_device_name = field_device_name; m_device_name = field_device_name;
} }
else
{
m_device_name = m_key_device_type == hw::device::device_type::LEDGER ? "Ledger" : "default";
}
}
} }
else else
{ {