From 389eceaf06b21a7b4b9997e7f9a2fb2eb33e9fb8 Mon Sep 17 00:00:00 2001 From: Jordan <31575189+jordanruthe@users.noreply.github.com> Date: Mon, 28 Dec 2020 15:53:20 -0500 Subject: [PATCH] job_status: fix percentage above 100; fix no timeout for job complete --- panels/job_status.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/panels/job_status.py b/panels/job_status.py index 74d31689..22fb2ace 100644 --- a/panels/job_status.py +++ b/panels/job_status.py @@ -397,7 +397,8 @@ class JobStatusPanel(ScreenPanel): self.set_state("complete") self.show_buttons_for_state() timeout = self._config.get_main_config().getint("job_complete_timeout", 30) - GLib.timeout_add(timeout * 1000, self.close_panel) + if timeout != 0: + GLib.timeout_add(timeout * 1000, self.close_panel) elif ps['state'] == "error" and self.state != "error": logger.debug("Error!") self.set_state("error") @@ -510,7 +511,7 @@ class JobStatusPanel(ScreenPanel): self.labels[label].set_text(text) def update_progress (self): - self.labels['progress_text'].set_text("%s%%" % (str(int(self.progress*100)))) + self.labels['progress_text'].set_text("%s%%" % (str( min(int(self.progress*100),100) ))) #def update_temp(self, dev, temp, target): # if dev in self.labels: