Clean up code comments and behaviour

neilenns · Jan 23, 2025 · 5779ed8 · 5779ed8
1 parent c54f881
commit 5779ed8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/events/streamDeck/stationStatus/stationStatusLongPress.ts b/src/events/streamDeck/stationStatus/stationStatusLongPress.ts
@@ -20,17 +20,21 @@ export const handleStationStatusLongPress = (action: KeyAction) => {
   // Mute if that's the requested action.
   if (foundAction.toggleMuteOnLongPress) {
     foundAction.toggleMute();
-    return;
   }
 
+  // Speaker if that's the requested action.
   if (foundAction.toggleSpeakerOnLongPress) {
     foundAction.toggleSpeaker();
-    return;
   }
 
   // If mute or speaker toggle isn't enabled, refresh the station state.
-  foundAction.reset();
-  trackAudioManager.refreshStationState(foundAction.callsign);
+  if (
+    !foundAction.toggleMuteOnLongPress &&
+    !foundAction.toggleSpeakerOnLongPress
+  ) {
+    foundAction.reset();
+    trackAudioManager.refreshStationState(foundAction.callsign);
+  }
 
   action.showOk().catch((error: unknown) => {
     handleAsyncException("Unable to show OK on station status button:", error);

diff --git a/src/events/streamDeck/stationStatus/stationStatusShortPress.ts b/src/events/streamDeck/stationStatus/stationStatusShortPress.ts
@@ -24,14 +24,15 @@ export const handleStationStatusShortPress = (action: KeyAction) => {
   // Mute if that's the requested action.
   if (foundAction.toggleMuteOnPress) {
     foundAction.toggleMute();
-    return;
   }
 
+  // Toggle speaker if that's the requested action.
   if (foundAction.toggleSpeakerOnPress) {
     foundAction.toggleSpeaker();
-    return;
   }
 
   // If mute or speaker isn't set then toggle listenTo.
-  foundAction.toggleListenTo();
+  if (!foundAction.toggleMuteOnPress && !foundAction.toggleSpeakerOnPress) {
+    foundAction.toggleListenTo();
+  }
 };