3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Andreea Scorojitu 2017-12-01 13:29:05 +01:00
commit 0fe51589ac
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/USBPrinting/USBPrinterOutputDevice.py
View file

@ -394,6 +394,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
self._listen_thread.join() self._listen_thread.join()
except: except:
pass pass
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._serial.close()
self._listen_thread = threading.Thread(target = self._listen) self._listen_thread = threading.Thread(target = self._listen)