GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 08:58:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor camera request fix

Browse Source 
CURA-4376

- Simplify the exception handling
- Use isFinished() to check the state of the network request
This commit is contained in:
Lipu Fei 2017-10-10 10:52:00 +02:00
parent d11b229118
commit 57b1cb3bc8
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View File

@ -332,16 +332,15 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._camera_timer.stop()
if self._image_reply:
skip_abort = False
try:
# disconnect the signal
try:
self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)
except Exception as e:
if type(e) != RuntimeError: # can happen the RuntimeError occurs before calling abort (=see below), then then the application will crash
skip_abort = True
pass #The signal was never connected.
if not skip_abort:
self._image_reply.abort()
except Exception:
pass
# abort the request if it's not finished
if not self._image_reply.isFinished():
self._image_reply.close()
except Exception as e: #RuntimeError
pass # It can happen that the wrapped c++ object is already deleted.
self._image_reply = None