summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-01-13 10:48:18 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2017-03-11 15:41:37 +0100
commit8f2e6ad0673e2fe2e3407c895eecbd478885f2c5 (patch)
tree9ca378dfcded5355cfe8d14e4a5c3d141ec31e68
parent90e626b52c75e9e117494f15f57177aaf912468c (diff)
downloadlibnitrokey-8f2e6ad0673e2fe2e3407c895eecbd478885f2c5.tar.gz
libnitrokey-8f2e6ad0673e2fe2e3407c895eecbd478885f2c5.tar.bz2
Do not call disconnect on connect
device will be disconnected automatically in its destructor Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
-rw-r--r--NitrokeyManager.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index b270eb3..833e916 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -61,7 +61,6 @@ namespace nitrokey{
}
bool NitrokeyManager::connect() {
- this->disconnect();
std::lock_guard<std::mutex> lock(mex_dev_com);
vector< shared_ptr<Device> > devices = { make_shared<Stick10>(), make_shared<Stick20>() };
for( auto & d : devices ){
@@ -74,7 +73,6 @@ namespace nitrokey{
bool NitrokeyManager::connect(const char *device_model) {
- this->disconnect();
std::lock_guard<std::mutex> lock(mex_dev_com);
switch (device_model[0]){
case 'P':