Merge branch '2.5'

This commit is contained in:
Jack Ha 2017-04-06 14:07:50 +02:00
commit 88a8ed9752

View File

@ -815,10 +815,10 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
return # Stop trying to zip, abort was called. return # Stop trying to zip, abort was called.
if self._use_gzip: if self._use_gzip:
batched_line += line
# if the gcode was read from a gcode file, self._gcode will be a list of all lines in that file. # if the gcode was read from a gcode file, self._gcode will be a list of all lines in that file.
# Compressing line by line in this case is extremely slow, so we need to batch them. # Compressing line by line in this case is extremely slow, so we need to batch them.
if len(batched_line) < max_chars_per_line: if len(batched_line) < max_chars_per_line:
batched_line += line
continue continue
byte_array_file_data += _compress_data_and_notify_qt(batched_line) byte_array_file_data += _compress_data_and_notify_qt(batched_line)