aboutsummaryrefslogtreecommitdiff
path: root/NitrokeyManager.cc
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2018-06-20 10:17:30 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2018-06-20 10:17:30 +0200
commitee6c9c61b93fae7e041abb19e42134d3a831a846 (patch)
treee411acfde373704febf61e4a2662b7ae77f8e2fd /NitrokeyManager.cc
parente1ef8d79809190c5ac5d540bd4aa376dcfda7e93 (diff)
parenta71507ba0ca4643201c4ceb3d4dfc0f6dd5ae770 (diff)
downloadlibnitrokey-ee6c9c61b93fae7e041abb19e42134d3a831a846.tar.gz
libnitrokey-ee6c9c61b93fae7e041abb19e42134d3a831a846.tar.bz2
Merge branch 'pr_115'
Fix connect() return value in offline mode Fixes #115
Diffstat (limited to 'NitrokeyManager.cc')
-rw-r--r--NitrokeyManager.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index addfdbf..ab4cac5 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -234,12 +234,14 @@ using nitrokey::misc::strcpyT;
bool NitrokeyManager::connect() {
std::lock_guard<std::mutex> lock(mex_dev_com_manager);
vector< shared_ptr<Device> > devices = { make_shared<Stick10>(), make_shared<Stick20>() };
+ bool connected = false;
for( auto & d : devices ){
if (d->connect()){
device = std::shared_ptr<Device>(d);
+ connected = true;
}
}
- return device != nullptr;
+ return connected;
}