Merge pull request #15 from ImDevinC/fix-initial-load

fix(startup): fixes a backend race condition that prevents icons
ImDevinC · Dec 31, 2024 · b6559be · b6559be
2 parents ac319ae + babbee9
commit b6559be
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 14 deletions.
diff --git a/actions/ChangeTextChannel.py b/actions/ChangeTextChannel.py
@@ -19,7 +19,11 @@ def on_ready(self):
             VOICE_CHANNEL_SELECT, self.update_display)
 
     def update_display(self, value: dict):
-        pass
+        if not self.plugin_base.backend:
+            self.show_error()
+            return
+        else:
+            self.hide_error()
 
     def on_tick(self):
         if self.channel_id:

diff --git a/actions/ChangeVoiceChannelAction.py b/actions/ChangeVoiceChannelAction.py
@@ -21,7 +21,11 @@ def on_ready(self):
             VOICE_CHANNEL_SELECT, self.update_display)
 
     def update_display(self, value: dict):
-        pass
+        if not self.plugin_base.backend:
+            self.show_error()
+            return
+        else:
+            self.hide_error()
 
     def on_tick(self):
         if self.current_channel:

diff --git a/actions/DeafenAction.py b/actions/DeafenAction.py
@@ -23,6 +23,11 @@ def on_ready(self):
             VOICE_SETTINGS_UPDATE, self.update_display)
 
     def update_display(self, value: dict):
+        if not self.plugin_base.backend:
+            self.show_error()
+            return
+        else:
+            self.hide_error()
         self.deafened = value['deaf']
         image = "undeafen.png"
         if self.deafened:

diff --git a/actions/MuteAction.py b/actions/MuteAction.py
@@ -23,6 +23,11 @@ def on_ready(self):
             VOICE_SETTINGS_UPDATE, self.update_display)
 
     def update_display(self, value: dict):
+        if not self.plugin_base.backend:
+            self.show_error()
+            return
+        else:
+            self.hide_error()
         self.muted = value['mute']
         image = "unmute.png"
         if self.muted:

diff --git a/main.py b/main.py
@@ -24,18 +24,6 @@ def __init__(self):
         self.lm = self.locale_manager
         self.lm.set_to_os_default()
 
-        settings = self.get_settings()
-        client_id = settings.get('client_id', '')
-        client_secret = settings.get('client_secret', '')
-        access_token = settings.get('access_token', '')
-
-        backend_path = os.path.join(self.PATH, 'backend.py')
-        self.launch_backend(backend_path=backend_path,
-                            open_in_terminal=False, venv_path=os.path.join(self.PATH, '.venv'))
-
-        self.backend.update_client_credentials(
-            client_id, client_secret, access_token)
-
         self.message_mute_action_holder = ActionHolder(
             plugin_base=self,
             action_base=MuteAction,
@@ -75,6 +63,19 @@ def __init__(self):
             app_version="1.5.0"
         )
 
+        settings = self.get_settings()
+        client_id = settings.get('client_id', '')
+        client_secret = settings.get('client_secret', '')
+        access_token = settings.get('access_token', '')
+
+        backend_path = os.path.join(self.PATH, 'backend.py')
+        self.launch_backend(backend_path=backend_path,
+                            open_in_terminal=False, venv_path=os.path.join(self.PATH, '.venv'))
+        self.wait_for_backend(10)
+
+        self.backend.update_client_credentials(
+            client_id, client_secret, access_token)
+
         self.add_css_stylesheet(os.path.join(self.PATH, "style.css"))
 
     def save_access_token(self, access_token: str):