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

Revert "Use self._camera_active to detect whether we should show the camera"

Browse source 
This reverts commit bd0b38f688.
This commit is contained in:
Ghostkeeper 2017-10-02 17:32:03 +02:00
parent 91c5515d4e
commit 1aa6d2876c
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/PrinterOutputDevice.py
View file

@ -242,8 +242,8 @@ class PrinterOutputDevice(QObject, OutputDevice):
@pyqtSlot() @pyqtSlot()
def stopCamera(self): def stopCamera(self):
self._stopCamera()
self._camera_active = False self._camera_active = False
self._stopCamera()
def _stopCamera(self): def _stopCamera(self):
Logger.log("w", "_stopCamera is not implemented by this output device") Logger.log("w", "_stopCamera is not implemented by this output device")

2
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View file

@ -334,7 +334,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
else: #Camera wasn't even running. Don't try to stop it or you'll get a segfault. else: #Camera wasn't even running. Don't try to stop it or you'll get a segfault.
return return
if self._camera_active: if self._image_reply:
try: try:
self._image_reply.abort() self._image_reply.abort()
self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress) self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)