From 52cadb7744d59aa7b35cd29271b3fda3462c443a Mon Sep 17 00:00:00 2001
From: Jordan Ruthe <jordan.ruthe@gmail.com>
Date: Wed, 20 Jan 2021 22:02:48 -0500
Subject: [PATCH] screen: bug fixes
---
screen.py | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/screen.py b/screen.py
index 577d2051..2c7a50dc 100644
--- a/screen.py
+++ b/screen.py
@@ -326,8 +326,10 @@ class KlipperScreen(Gtk.Window):
# Find current menu item
panels = list(self._cur_panels)
- if "job_status" not in self._cur_panels:
+ if "main_panel" in self._cur_panels:
menu = "__main"
+ elif "splash_screen" in self._cur_panels:
+ menu = "__splashscreen"
else:
menu = "__print"
@@ -401,6 +403,8 @@ class KlipperScreen(Gtk.Window):
)
def state_printing(self):
+ if "job_status" in self._cur_panels:
+ return
self.printer_printing()
def state_ready(self):
@@ -510,11 +514,16 @@ class KlipperScreen(Gtk.Window):
'webhooks'
]
printer_info = self.apiclient.get_printer_info()
- logger.debug("Sendingn request %s" % "printer/objects/query?" + "&".join(status_objects))
+ logger.debug("Sending request %s" % "printer/objects/query?" + "&".join(status_objects))
data = self.apiclient.send_request("printer/objects/query?" + "&".join(status_objects))
powerdevs = self.apiclient.send_request("machine/device_power/devices")
data = data['result']['status']
+ if self.files == None:
+ self.files = KlippyFiles(self)
+ else:
+ self.files.add_timeout()
+
# Reinitialize printer, in case the printer was shut down and anything has changed.
self.printer.reinit(printer_info['result'], data)
self.ws_subscribe()
@@ -522,11 +531,6 @@ class KlipperScreen(Gtk.Window):
if powerdevs != False:
self.printer.configure_power_devices(powerdevs['result'])
- if self.files == None:
- self.files = KlippyFiles(self)
- else:
- self.files.add_timeout()
-
def printer_ready(self):
self.close_popup_message()
self.show_panel('main_panel', "main_menu", "Main Menu", 2, items=self._config.get_menu_items("__main"),