From 18dec56c80c0c0c574cf71da4bdc5c203384fa72 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Thu, 24 Jan 2019 13:13:08 +0000
Subject: [PATCH] Fixed composite lock error

---
 openflexure_microscope/lock.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openflexure_microscope/lock.py b/openflexure_microscope/lock.py
index af040cd1..2851e1f5 100644
--- a/openflexure_microscope/lock.py
+++ b/openflexure_microscope/lock.py
@@ -52,9 +52,7 @@ class CompositeLock(object):
         if all(result):
             return result
         else:
-            msg = "Unable to acquire all locks {}.".format(self.locks)
-            logging.error(msg)
-            raise ThreadError(msg)
+            raise LockError('ACQUIRE_ERROR', self)
 
     def __exit__(self, *args):
         for lock in self.locks: