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

Don't try to disconnect after aborting

Browse Source 
Because if the signal is not connected then we'd get a segfault in this case.

Contributes to issue CURA-4376.
This commit is contained in:
Ghostkeeper 2017-10-02 17:34:49 +02:00
parent 1aa6d2876c
commit 6fc62fd2b3
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View File

@ -331,13 +331,14 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
if self._camera_timer.isActive(): if self._camera_timer.isActive():
self._camera_timer.stop() self._camera_timer.stop()
else: #Camera wasn't even running. Don't try to stop it or you'll get a segfault.
return
if self._image_reply: if self._image_reply:
try: try:
self._image_reply.abort() try:
self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress) self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)
except TypeError:
pass #The signal was never connected.
self._image_reply.abort()
except RuntimeError: except RuntimeError:
pass # It can happen that the wrapped c++ object is already deleted. pass # It can happen that the wrapped c++ object is already deleted.
self._image_reply = None self._image_reply = None