From 046fffdd14974ad595ddf3632d4f955f6c8a0a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 28 May 2015 16:07:50 +0200 Subject: [PATCH] Fixed a deadlock in the communication layer when pausing via M0 Using reentrant locks to allow sending of additional commands --- src/octoprint/util/comm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index e54c947f..8a0264d4 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -213,7 +213,7 @@ class MachineCom(object): # multithreading locks self._sendNextLock = threading.Lock() - self._sendingLock = threading.Lock() + self._sendingLock = threading.RLock() # monitoring thread self._monitoring_active = True