3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 23:46:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

UpdateThread now only joins when it's actually running

Browse source 
An output device can be created and never have it's connect called.
Because the delete of the output device calls close, we need to handle this

CURA-49
This commit is contained in:
Jaime van Kessel 2016-04-19 12:15:45 +02:00
parent 1a44c394e1
commit 387dae140f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
NetworkPrinterOutputDevice.py
View file

@ -65,7 +65,6 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self.setProgress(print_job_reply.json()["progress"]) self.setProgress(print_job_reply.json()["progress"])
else: else:
self.setProgress(0) self.setProgress(0)
except Exception as e: except Exception as e:
self.setConnectionState(ConnectionState.error) self.setConnectionState(ConnectionState.error)
@ -86,8 +85,9 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
def close(self): def close(self):
self._connection_state == ConnectionState.closed self._connection_state == ConnectionState.closed
self._update_thread.join() if self._update_thread != None:
self._update_thread = None self._update_thread.join()
self._update_thread = None
def requestWrite(self, node, file_name = None, filter_by_machine = False): def requestWrite(self, node, file_name = None, filter_by_machine = False):
self._file = getattr(Application.getInstance().getController().getScene(), "gcode_list") self._file = getattr(Application.getInstance().getController().getScene(), "gcode_list")