pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly handle serial close on Macs

Browse source 
Readline could still be stuck in a read loop, leading to an exception on Mac
when closing the connection from another thread. This should now be captured
correctly.

Fixes #1021
(cherry picked from commit c829b27)
This commit is contained in:
Gina Häußge 2015-08-13 17:15:01 +02:00
parent 49f62bc655
commit e8ef0ba8a4
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/octoprint/util/comm.py
View file

@ -384,6 +384,10 @@ class MachineCom(object):
##~~ external interface
def close(self, isError = False):
if self._connection_closing:
return
self._connection_closing = True
if self._temperature_timer is not None:
try:
self._temperature_timer.cancel()
@ -1322,7 +1326,7 @@ class MachineCom(object):
return line
def _readline(self):
if self._serial is None:
if self._serial == None or self._connection_closing:
return None
try:
@ -1642,7 +1646,7 @@ class MachineCom(object):
self._doSendWithoutChecksum(commandToSend)
def _doSendWithoutChecksum(self, cmd):
if self._serial is None:
if self._serial is None or self._connection_closing:
return
self._log("Send: %s" % cmd)