Merge branch 'release-0.7.0'

1 files changed, 4 insertions, 9 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 92247d7..5b72d63 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -133,8 +133,6 @@ use std::marker;
 use std::ptr::NonNull;
 use std::sync;
 
-use nitrokey_sys;
-
 pub use crate::auth::{Admin, Authenticate, User};
 pub use crate::config::Config;
 pub use crate::device::{
@@ -472,13 +470,10 @@ pub fn take() -> Result<sync::MutexGuard<'static, Manager>, Error> {
 /// [`ConcurrentAccessError`]: struct.Error.html#variant.ConcurrentAccessError
 /// [`Manager`]: struct.Manager.html
 pub fn force_take() -> Result<sync::MutexGuard<'static, Manager>, Error> {
-    match take() {
-        Ok(guard) => Ok(guard),
-        Err(err) => match err {
-            Error::PoisonError(err) => Ok(err.into_inner()),
-            err => Err(err),
-        },
-    }
+    MANAGER.try_lock().or_else(|err| match err {
+        sync::TryLockError::Poisoned(err) => Ok(err.into_inner()),
+        sync::TryLockError::WouldBlock => Err(Error::ConcurrentAccessError),
+    })
 }
 
 /// List all connected Nitrokey devices.