Merge branch 'fix/noProgressReportOn0' into devel

Conflicts:
	src/octoprint/__init__.py
This commit is contained in:
Gina Häußge 2016-05-20 10:27:20 +02:00
commit 833bf07ded

View file

@ -640,7 +640,7 @@ class Printer(PrinterInterface, comm.MachineComPrintCallback):
printTimeLeft = totalPrintTime - cleanedPrintTime if (totalPrintTime is not None and cleanedPrintTime is not None) else None
if progress:
if progress is not None:
progress_int = int(progress * 100)
if self._lastProgressReport != progress_int:
self._lastProgressReport = progress_int