From 03bf603839a9d4df0633a440ea3d7373fa298cfc Mon Sep 17 00:00:00 2001 From: JezerM Date: Wed, 13 Oct 2021 13:04:23 -0600 Subject: [PATCH] Bugfixes --- web-greeter/bridge/Greeter.py | 3 ++- web-greeter/browser/browser.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/web-greeter/bridge/Greeter.py b/web-greeter/bridge/Greeter.py index 619a97d..249c7f2 100644 --- a/web-greeter/bridge/Greeter.py +++ b/web-greeter/bridge/Greeter.py @@ -400,7 +400,8 @@ class Greeter(BridgeObject): if not session.strip(): return started = LightDMGreeter.start_session_sync(session) - if started or self.is_authenticated(): + if started or self.is_authenticated: + logger.debug("Session \"" + session + "\" started") reset_screensaver() return started diff --git a/web-greeter/browser/browser.py b/web-greeter/browser/browser.py index 974912b..88388b4 100644 --- a/web-greeter/browser/browser.py +++ b/web-greeter/browser/browser.py @@ -247,14 +247,14 @@ class Browser(Application): self.show() def load(self): + self.load_script(':/_greeter/js/bundle.js', 'Web Greeter Bundle') + self.load_theme() self.greeter = Greeter() self.greeter_config = Config() self.theme_utils = ThemeUtils(self.greeter) self.bridge_objects = (self.greeter, self.greeter_config, self.theme_utils) self.initialize_bridge_objects() - self.load_script(':/_greeter/js/bundle.js', 'Web Greeter Bundle') - self.load_theme() def _initialize_devtools(self): self.dev_view = QWebEngineView(parent=self.window) @@ -327,6 +327,8 @@ class Browser(Application): print("Path does not exists") path_to_theme = os.path.join(dir, def_theme, "index.html") + web_greeter_config["config"]["greeter"]["theme"] = path_to_theme + url = QUrl("web-greeter://app/{0}".format(path_to_theme)) self.page.load(url)