Merge remote-tracking branch 'origin/4.0'

This commit is contained in:
Lipu Fei 2019-02-01 11:08:33 +01:00
commit efa26c8323
11 changed files with 333 additions and 75 deletions

View file

@ -115,7 +115,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
def requestWrite(self, nodes, file_name = None, filter_by_machine = False, file_handler = None, **kwargs):
if self._is_printing:
return # Aleady printing
self.writeStarted.emit(self)
# cancel any ongoing preheat timer before starting a print
self._printers[0].getController().stopPreheatTimers()