mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-08 15:37:27 -06:00
UpdateThread now only joins when it's actually running
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:
parent
1a44c394e1
commit
387dae140f
1 changed files with 3 additions and 3 deletions
|
@ -65,7 +65,6 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
|
|||
self.setProgress(print_job_reply.json()["progress"])
|
||||
else:
|
||||
self.setProgress(0)
|
||||
|
||||
|
||||
except Exception as e:
|
||||
self.setConnectionState(ConnectionState.error)
|
||||
|
@ -86,8 +85,9 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
|
|||
|
||||
def close(self):
|
||||
self._connection_state == ConnectionState.closed
|
||||
self._update_thread.join()
|
||||
self._update_thread = None
|
||||
if self._update_thread != None:
|
||||
self._update_thread.join()
|
||||
self._update_thread = None
|
||||
|
||||
def requestWrite(self, node, file_name = None, filter_by_machine = False):
|
||||
self._file = getattr(Application.getInstance().getController().getScene(), "gcode_list")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue