From 2c3bd3a88ed1498eed3431fb735e1593b87a1010 Mon Sep 17 00:00:00 2001
From: joBr99 <29555657+joBr99@users.noreply.github.com>
Date: Sat, 25 Nov 2023 00:54:34 +0100
Subject: [PATCH] fix callbacks

---
 nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/main.py  | 2 +-
 nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/main.py b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/main.py
index fbe5b7b5..73f059af 100644
--- a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/main.py
+++ b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/main.py
@@ -154,7 +154,7 @@ def setup_panels():
         if "hiddenCards" not in settings_panel:
             settings_panel["hiddenCards"] = settings.get("hiddenCards", [])
 
-        panels[name] = LovelaceUIPanel(client, name, settings_panel)
+        panels[name] = LovelaceUIPanel(name, settings_panel)
         libs.panel_cmd.page_type(
             settings_panel["panelSendTopic"], "pageStartup")
 
diff --git a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py
index fccbb628..c956cfdd 100644
--- a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py
+++ b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py
@@ -12,8 +12,7 @@ import ha_control
 
 class LovelaceUIPanel:
 
-    def __init__(self, mqtt_client_from_manager, name_panel, settings_panel):
-        self.mqtt_client = mqtt_client_from_manager
+    def __init__(self, name_panel, settings_panel):
         self.name = name_panel
         self.settings = settings_panel
         self.sendTopic = self.settings["panelSendTopic"]
@@ -70,6 +69,8 @@ class LovelaceUIPanel:
         schedule_thread.daemon = True
         schedule_thread.start()
 
+        libs.panel_cmd.page_type(self.sendTopic, "pageStartup")
+
     def schedule_thread_target(self):
         while True:
             self.schedule.exec_jobs()
@@ -96,8 +97,8 @@ class LovelaceUIPanel:
             return self.hidden_cards[iid]
 
     def ha_event_callback(self, entity_id):
-        #logging.debug(f"{self.name} {entity_id} updated/state changed")
-        if entity_id in self.current_card.get_entities():
+        logging.debug(f"{self.name} {entity_id} updated/state changed")
+        if self.current_card and entity_id in self.current_card.get_entities():
             self.render_current_page(requested=True)
 
             # send update for detail popup in case it's open