Job_status: Fix issue with standby state that prevented closing

This commit is contained in:
alfrix 2022-02-04 14:18:11 -03:00
parent ffb62f149c
commit 5c23946283

View File

@ -310,7 +310,9 @@ class JobStatusPanel(ScreenPanel):
def close_panel(self, widget=None): def close_panel(self, widget=None):
logging.debug("Closing job_status panel") logging.debug("Closing job_status panel")
self.remove_close_timeout() self.remove_close_timeout()
self._screen.printer_ready() self.state_check()
if self.state not in ["printing", "paused"]:
self._screen.printer_ready()
return False return False
def remove_close_timeout(self): def remove_close_timeout(self):
@ -461,7 +463,7 @@ class JobStatusPanel(ScreenPanel):
if timeout != 0: if timeout != 0:
self.close_timeouts.append(GLib.timeout_add_seconds(timeout, self.close_panel)) self.close_timeouts.append(GLib.timeout_add_seconds(timeout, self.close_panel))
return False return False
elif ps['state'] == "cancelled" or ps['state'] == "standby": elif ps['state'] == "cancelled":
# Print was cancelled # Print was cancelled
self.set_state("cancelled") self.set_state("cancelled")
self._screen.wake_screen() self._screen.wake_screen()
@ -472,6 +474,8 @@ class JobStatusPanel(ScreenPanel):
return False return False
elif ps['state'] == "paused": elif ps['state'] == "paused":
self.set_state("paused") self.set_state("paused")
elif ps['state'] == "standby":
self.set_state("standby")
return True return True
def set_state(self, state): def set_state(self, state):