From da490fdfcd98f0cfb31fe601d37c5139705200ff Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Wed, 28 Oct 2020 15:40:29 +0000
Subject: [PATCH] Separated move_and_measure locks

---
 openflexure_microscope/api/default_extensions/autofocus.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openflexure_microscope/api/default_extensions/autofocus.py b/openflexure_microscope/api/default_extensions/autofocus.py
index 089eae4c..507a9fac 100644
--- a/openflexure_microscope/api/default_extensions/autofocus.py
+++ b/openflexure_microscope/api/default_extensions/autofocus.py
@@ -325,7 +325,7 @@ class MoveAndMeasureAPI(ActionView):
 
         if microscope.has_real_stage():
             # Acquire microscope lock with 1s timeout
-            with microscope.lock(timeout=1):
+            with microscope.camera.lock, microscope.stage.lock:
                 return move_and_measure(microscope, dz=args.get("dz"))
 
         else: