3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '3.1'

Browse source
This commit is contained in:
Ghostkeeper 2017-12-01 14:41:41 +01:00
commit 2236e0016d
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
6 changed files with 70 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/USBPrinting/USBPrinterOutputDevice.py
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