diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-15 13:50:21 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-15 13:50:21 +0200 |
| commit | 6834ce6de2eb0512a4fbb4193a944f3f3b6397fc (patch) | |
| tree | 40fa7453a576fbb532fac721e7606a0c272ff6b4 | |
| parent | Merge pull request #4569 (diff) | |
| parent | SOFTWARE is the default wallet device (diff) | |
| download | monero-6834ce6de2eb0512a4fbb4193a944f3f3b6397fc.tar.xz | |
Merge pull request #4574
a04d68f6 SOFTWARE is the default wallet device (m2049r)
| -rw-r--r-- | src/wallet/wallet2.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index f87edf506..d774c54c0 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -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()) { |