aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_basic/account.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-09-18 17:29:26 +0200
committerRiccardo Spagni <ric@spagni.net>2018-09-18 17:29:26 +0200
commitb4a9ebad6c43205225be9ad9634ff2a31527d987 (patch)
tree33b1623bb80cc940477088bd7333b4615d287462 /src/cryptonote_basic/account.cpp
parentMerge pull request #4273 (diff)
parenthw_device: support for multiple devices added [for review] (diff)
downloadmonero-b4a9ebad6c43205225be9ad9634ff2a31527d987.tar.xz
Merge pull request #4299
f9b22a7b hw_device: support for multiple devices added [for review] (Dusan Klinec)
Diffstat (limited to 'src/cryptonote_basic/account.cpp')
-rw-r--r--src/cryptonote_basic/account.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/cryptonote_basic/account.cpp b/src/cryptonote_basic/account.cpp
index 4cbfa8142..e891a748d 100644
--- a/src/cryptonote_basic/account.cpp
+++ b/src/cryptonote_basic/account.cpp
@@ -197,10 +197,14 @@ DISABLE_VS_WARNINGS(4244 4345)
//-----------------------------------------------------------------
void account_base::create_from_device(const std::string &device_name)
{
-
hw::device &hwdev = hw::get_device(device_name);
- m_keys.set_device(hwdev);
hwdev.set_name(device_name);
+ create_from_device(hwdev);
+ }
+
+ void account_base::create_from_device(hw::device &hwdev)
+ {
+ m_keys.set_device(hwdev);
MCDEBUG("ledger", "device type: "<<typeid(hwdev).name());
hwdev.init();
hwdev.connect();