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

Merge branch '3.0'

Browse source 
Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.
This commit is contained in:
Ghostkeeper 2017-10-02 17:40:24 +02:00
commit 1d7792861d
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
20 changed files with 221 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View file

@ -335,8 +335,11 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
if self._image_reply:
try:
try:
self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)
except TypeError:
pass #The signal was never connected.
self._image_reply.abort()
self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)
except RuntimeError:
pass # It can happen that the wrapped c++ object is already deleted.
self._image_reply = None
@ -427,7 +430,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
Logger.log("d", "Requestion authentication for %s due to action %s" % (self._key, action_id))
self._authentication_failed_message.hide()
self._not_authenticated_message.hide()
self._authentication_state = AuthState.NotAuthenticated
self.setAuthenticationState(AuthState.NotAuthenticated)
self._authentication_counter = 0
self._authentication_requested_message.setProgress(0)
self._authentication_id = None
@ -614,7 +617,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
# Reset authentication state
self._authentication_requested_message.hide()
self._authentication_state = AuthState.NotAuthenticated
self.setAuthenticationState(AuthState.NotAuthenticated)
self._authentication_counter = 0
self._authentication_timer.stop()