Add a thread lock to the machineCom _sendCommand

[cura.git] / Cura / util / machineCom.py

diff --git a/Cura/util/machineCom.py b/Cura/util/machineCom.py
index e6ce8c11d0f2e537f134b8e9b6754b265a778593..90c9d3eb2c4cc0ff4f6f2d2e69bff36982e6975b 100644 (file)
--- a/Cura/util/machineCom.py
+++ b/Cura/util/machineCom.py
@@ -203,7 +203,8 @@ class MachineCom(object):
                self._heatupWaitTimeLost = 0.0
                self._printStartTime100 = None
                self._currentCommands = []
-               
+
+               self._thread_lock = threading.Lock()
                self.thread = threading.Thread(target=self._monitor)
                self.thread.daemon = True
                self.thread.start()
@@ -589,7 +590,9 @@ class MachineCom(object):
                self.close()
        
        def _sendCommand(self, cmd):
+               self._thread_lock.acquire(True)
                if self._serial is None:
+                       self._thread_lock.release()
                        return
                if 'M109' in cmd or 'M190' in cmd:
                        self._heatupWaitStartTime = time.time()
@@ -624,6 +627,7 @@ class MachineCom(object):
                        self._log("Unexpected error while writing serial port: %s" % (getExceptionString()))
                        self._errorValue = getExceptionString()
                        self.close(True)
+               self._thread_lock.release()
 
        def _sendNext(self):
                if self._gcodePos >= len(self._gcodeList):