diff --git a/discover_overlay/discord_connector.py b/discover_overlay/discord_connector.py index 6e35a78..660ce75 100644 --- a/discover_overlay/discord_connector.py +++ b/discover_overlay/discord_connector.py @@ -429,12 +429,9 @@ class DiscordConnector: """ self.sub_server() self.find_user() - self.voice_overlay.set_enabled(True) - if self.text_overlay: - self.text_overlay.set_enabled(self.text_settings.enabled) - if self.current_text: - self.start_listening_text(self.current_text) - + if self.current_text: + self.start_listening_text(self.current_text) + def on_error(self, error): """ Called when an error has occured @@ -446,9 +443,11 @@ class DiscordConnector: Called when connection is closed """ log.warning("Connection closed") - self.voice_overlay.hide() - if self.text_overlay: - self.text_overlay.hide() + self.discover.voice_overlay.set_blank() + if self.discover.text_overlay: + self.discover.text_overlay.set_blank() + if self.discover.notification_overlay: + self.discover.notification_overlay.set_blank() self.websocket = None self.reconnect_delay = 60 * 5 diff --git a/discover_overlay/notification_overlay.py b/discover_overlay/notification_overlay.py index e3a3ce3..f56c66d 100644 --- a/discover_overlay/notification_overlay.py +++ b/discover_overlay/notification_overlay.py @@ -66,6 +66,10 @@ class NotificationOverlayWindow(OverlayWindow): self.set_title("Discover Text") self.redraw() + def set_blank(self): + self.content=[] + self.needsredraw=True + def tick(self): # This doesn't really belong in overlay or settings now = time.time() diff --git a/discover_overlay/overlay.py b/discover_overlay/overlay.py index a577bde..9a8a8db 100644 --- a/discover_overlay/overlay.py +++ b/discover_overlay/overlay.py @@ -66,7 +66,6 @@ class OverlayWindow(Gtk.Window): self.needsredraw = True self.hidden = False self.enabled = False - self.set_size_request(50, 50) self.connect('draw', self.overlay_draw) # Set RGBA diff --git a/discover_overlay/text_overlay.py b/discover_overlay/text_overlay.py index caf702e..6bef9c6 100644 --- a/discover_overlay/text_overlay.py +++ b/discover_overlay/text_overlay.py @@ -55,6 +55,10 @@ class TextOverlayWindow(OverlayWindow): self.set_title("Discover Text") self.redraw() + def set_blank(self): + self.content=[] + self.needsredraw=True + def tick(self): if len(self.attachment) > self.line_limit: # We've probably got old images! diff --git a/discover_overlay/voice_overlay.py b/discover_overlay/voice_overlay.py index 24ade9b..5e9bdb0 100644 --- a/discover_overlay/voice_overlay.py +++ b/discover_overlay/voice_overlay.py @@ -91,6 +91,10 @@ class VoiceOverlayWindow(OverlayWindow): 'def', self.avatar_size) self.set_title("Discover Voice") self.redraw() + + def set_blank(self): + self.userlist=[] + self.needsredraw=True def set_show_dummy(self, show_dummy): """ @@ -351,7 +355,7 @@ class VoiceOverlayWindow(OverlayWindow): userlist = self.dummy_data for user in userlist: # Bad object equality here, so we need to reassign - if user["id"] == self_user["id"]: + if "id" in self_user and user["id"] == self_user["id"]: self_user = user # Update friendly name with nick if possible diff --git a/discover_overlay/voice_settings.py b/discover_overlay/voice_settings.py index ea48acd..4c7d325 100644 --- a/discover_overlay/voice_settings.py +++ b/discover_overlay/voice_settings.py @@ -182,6 +182,7 @@ class VoiceSettingsWindow(SettingsWindow): self.overlay.set_horizontal(self.horizontal) self.overlay.set_guild_ids(self.guild_ids) self.overlay.set_overflow(self.overflow) + self.overlay.set_enabled(True) self.overlay.set_floating( self.floating, self.floating_x, self.floating_y, self.floating_w, self.floating_h) @@ -788,6 +789,9 @@ class VoiceSettingsWindow(SettingsWindow): def change_dummy_data(self, button): self.overlay.set_show_dummy(button.get_active()) self.show_dummy = button.get_active() + if self.show_dummy: + self.overlay.set_enabled(True) + self.overlay.set_hidden(False) def change_dummy_count(self, button): self.overlay.set_dummy_count(int(button.get_value()))