Merge branch 'master' of git://github.com/santigimeno/node-pcsclite into master
# Conflicts: # package.json
This commit is contained in:
@@ -319,9 +319,9 @@ NAN_METHOD(CardReader::Close) {
|
||||
} while ((ret != 0) && (++ times < 5));
|
||||
}
|
||||
|
||||
uv_mutex_unlock(&obj->m_mutex);
|
||||
assert(uv_thread_join(&obj->m_status_thread) == 0);
|
||||
obj->m_status_thread = 0;
|
||||
uv_mutex_unlock(&obj->m_mutex);
|
||||
}
|
||||
|
||||
info.GetReturnValue().Set(Nan::New<Number>(result));
|
||||
|
||||
Reference in New Issue
Block a user