diff options
author | Riccardo Spagni <ric@spagni.net> | 2019-01-28 21:26:43 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2019-01-28 21:26:44 +0200 |
commit | 0c970fde1c7eff1aed1890786e0a1c95e76cdc83 (patch) | |
tree | e62c9d33377fcb17804dfef753927fe1d50e5025 | |
parent | Merge pull request #5052 (diff) | |
parent | device_ledger: remove full_name variable (diff) | |
download | monero-0c970fde1c7eff1aed1890786e0a1c95e76cdc83.tar.xz |
Merge pull request #5054
93c21644 device_ledger: remove full_name variable (selsta)
-rw-r--r-- | src/device/device_ledger.cpp | 2 | ||||
-rw-r--r-- | src/device/device_ledger.hpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/device/device_ledger.cpp b/src/device/device_ledger.cpp index afe3bea62..ac2bb0979 100644 --- a/src/device/device_ledger.cpp +++ b/src/device/device_ledger.cpp @@ -322,7 +322,7 @@ namespace hw { } const std::string device_ledger::get_name() const { - if (this->full_name.empty() || !this->connected()) { + if (!this->connected()) { return std::string("<disconnected:").append(this->name).append(">"); } return this->name; diff --git a/src/device/device_ledger.hpp b/src/device/device_ledger.hpp index 88c9419a8..e76719a6e 100644 --- a/src/device/device_ledger.hpp +++ b/src/device/device_ledger.hpp @@ -85,7 +85,6 @@ namespace hw { //IO hw::io::device_io_hid hw_device; - std::string full_name; unsigned int length_send; unsigned char buffer_send[BUFFER_SEND_SIZE]; unsigned int length_recv; |