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

Always hide progress message if connection is lost

Browse source
This commit is contained in:
Jaime van Kessel 2016-09-19 11:31:20 +02:00
parent 27d017b29e
commit 66b22134ba
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
NetworkPrinterOutputDevice.py
View file

@ -294,6 +294,10 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._connection_message = Message(i18n_catalog.i18nc("@info:status", self._connection_message = Message(i18n_catalog.i18nc("@info:status",
"The connection with the network was lost.")) "The connection with the network was lost."))
self._connection_message.show() self._connection_message.show()
if self._progress_message:
self._progress_message.hide()
# Check if we were uploading something. Abort if this is the case. # Check if we were uploading something. Abort if this is the case.
# Some operating systems handle this themselves, others give weird issues. # Some operating systems handle this themselves, others give weird issues.
try: try:
@ -305,7 +309,6 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
pass # The disconnection can fail on mac in some cases. Ignore that. pass # The disconnection can fail on mac in some cases. Ignore that.
self._post_reply.abort() self._post_reply.abort()
self._progress_message.hide()
except RuntimeError: except RuntimeError:
self._post_reply = None # It can happen that the wrapped c++ object is already deleted. self._post_reply = None # It can happen that the wrapped c++ object is already deleted.
return return
@ -321,6 +324,10 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._connection_state_before_timeout = self._connection_state self._connection_state_before_timeout = self._connection_state
self._connection_message = Message(i18n_catalog.i18nc("@info:status", "The connection with the printer was lost. Check your printer to see if it is connected.")) self._connection_message = Message(i18n_catalog.i18nc("@info:status", "The connection with the printer was lost. Check your printer to see if it is connected."))
self._connection_message.show() self._connection_message.show()
if self._progress_message:
self._progress_message.hide()
# Check if we were uploading something. Abort if this is the case. # Check if we were uploading something. Abort if this is the case.
# Some operating systems handle this themselves, others give weird issues. # Some operating systems handle this themselves, others give weird issues.
try: try:
@ -332,7 +339,6 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
pass # The disconnection can fail on mac in some cases. Ignore that. pass # The disconnection can fail on mac in some cases. Ignore that.
self._post_reply.abort() self._post_reply.abort()
self._progress_message.hide()
except RuntimeError: except RuntimeError:
self._post_reply = None # It can happen that the wrapped c++ object is already deleted. self._post_reply = None # It can happen that the wrapped c++ object is already deleted.
self.setConnectionState(ConnectionState.error) self.setConnectionState(ConnectionState.error)