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

Fixed some merge issues

Browse source
This commit is contained in:
Jaime van Kessel 2016-11-03 17:32:17 +01:00
parent 6f179106b5
commit e7d04f7dc0
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
NetworkPrinterOutputDevice.py
View file

@ -131,7 +131,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._image_request = None self._image_request = None
self._image_reply = None self._image_reply = None
self._use_stream = True self._use_stream = False
self._stream_buffer = b"" self._stream_buffer = b""
self._stream_buffer_start_index = -1 self._stream_buffer_start_index = -1
@ -491,11 +491,11 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
self._update_timer.stop() self._update_timer.stop()
self._camera_timer.stop() self._camera_timer.stop()
if self._image_reply: if self._image_reply:
self._image_reply.abort() self._image_reply.abort()
self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress) self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)
self._image_reply = None self._image_reply = None
self._image_request = None self._image_request = None
## Request the current scene to be sent to a network-connected printer. ## Request the current scene to be sent to a network-connected printer.
# #