diff --git a/panels/job_status.py b/panels/job_status.py index 9fcca08d..c3d14b74 100644 --- a/panels/job_status.py +++ b/panels/job_status.py @@ -359,6 +359,8 @@ class JobStatusPanel(ScreenPanel): self.set_state("cancelling") elif "action:paused" in data: self.set_state("paused") + elif "action:resumed" in data: + self.set_state("printing") return elif action != "notify_status_update": return @@ -446,6 +448,7 @@ class JobStatusPanel(ScreenPanel): def state_check(self): ps = self._printer.get_stat("print_stats") + if ps['state'] == self.state: return True _ = self.lang.gettext @@ -454,6 +457,7 @@ class JobStatusPanel(ScreenPanel): if self.state == "cancelling": return True self.set_state("printing") + self.update_filename() elif ps['state'] == "complete": self.progress = 1 self.update_progress() @@ -482,17 +486,6 @@ class JobStatusPanel(ScreenPanel): return False elif ps['state'] == "paused": self.set_state("paused") - - # TODO: Remove this in the future - if self.filename != ps['filename']: - if ps['filename'] != "": - self.filename = ps['filename'] - self.file_metadata = {} - self.update_text("file", self.filename.split("/")[-1]) - else: - file = "Unknown" - self.update_text("file", "Unknown file") - return True def set_state(self, state):