Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1

This commit is contained in:
Andreea Scorojitu 2017-12-01 13:29:05 +01:00
commit 0fe51589ac

View File

@ -394,7 +394,8 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
self._listen_thread.join()
except:
pass
self._serial.close()
if self._serial is not None: # Avoid a race condition when a thread can change the value of self._serial to None
self._serial.close()
self._listen_thread = threading.Thread(target = self._listen)
self._listen_thread.daemon = True