From 5f53b704dddf87b9a2e0eeac26bcc4445898bcd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 13 Aug 2015 17:22:26 +0200 Subject: [PATCH] Use connection closing flag only for exception handling Otherwise we kill the beforePrinterDisconnected gcode script... See #1021 (cherry picked from commit 2fe956e) --- src/octoprint/util/comm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index 9250ea34..cc96504d 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -1326,7 +1326,7 @@ class MachineCom(object): return line def _readline(self): - if self._serial == None or self._connection_closing: + if self._serial is None: return None try: @@ -1646,7 +1646,7 @@ class MachineCom(object): self._doSendWithoutChecksum(commandToSend) def _doSendWithoutChecksum(self, cmd): - if self._serial is None or self._connection_closing: + if self._serial is None: return self._log("Send: %s" % cmd)