From 2db1cff224b1a81ca557c47772f66eb58f102ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 4 Jan 2013 11:08:19 +0100 Subject: [PATCH] Bugfixes... --- printer_webui/timelapse.py | 4 ++-- printer_webui/util/comm.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/printer_webui/timelapse.py b/printer_webui/timelapse.py index ba768c30..5843a76f 100644 --- a/printer_webui/timelapse.py +++ b/printer_webui/timelapse.py @@ -95,8 +95,8 @@ class TimedTimelapse(Timelapse): self.timerThread = None - def onPrintjobStarted(self): - Timelapse.onPrintjobStarted(self) + def onPrintjobStarted(self, filename): + Timelapse.onPrintjobStarted(self, filename) if self.timerThread is not None: return diff --git a/printer_webui/util/comm.py b/printer_webui/util/comm.py index fc9ff30e..6308b677 100644 --- a/printer_webui/util/comm.py +++ b/printer_webui/util/comm.py @@ -242,7 +242,10 @@ class MachineCom(object): return self._gcodePos def getPrintTime(self): - return time.time() - self._printStartTime100 + if self._printStartTime100 == None: + return 0 + else: + return time.time() - self._printStartTime100 def getPrintTimeRemainingEstimate(self): if self._printStartTime100 == None or self.getPrintPos() < 200: