From 1da22f4b9a83ea5c2697c9b41a91b09c7e56844e Mon Sep 17 00:00:00 2001
From: ItsRiprod <riprodgames@gmail.com>
Date: Thu, 31 Oct 2024 08:53:37 -0700
Subject: [PATCH] v0.9.1 Playback Location hotfix

---
 .../src/main/handlers/musicHandler.ts         | 21 +++++++++++++++++--
 .../src/overlays/settings/MusicSettings.tsx   |  2 ++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/DeskThingServer/src/main/handlers/musicHandler.ts b/DeskThingServer/src/main/handlers/musicHandler.ts
index 907b4a31..2d7cbe08 100644
--- a/DeskThingServer/src/main/handlers/musicHandler.ts
+++ b/DeskThingServer/src/main/handlers/musicHandler.ts
@@ -33,8 +33,17 @@ export class MusicHandler {
   private handleSettingsUpdate = (settings: Settings): void => {
     this.updateRefreshInterval(settings.refreshInterval)
 
-    if (settings.playbackLocation && settings.playbackLocation !== this.currentApp) {
+    dataListener.asyncEmit(
+      MESSAGE_TYPES.LOGGING,
+      `[MusicHandler]: Received settings update - checking for changes`
+    )
+    if (settings.playbackLocation) {
+      dataListener.asyncEmit(
+        MESSAGE_TYPES.LOGGING,
+        `[MusicHandler]: Setting restarting to use ${settings.playbackLocation}`
+      )
       this.currentApp = settings.playbackLocation
+      this.refreshMusicData()
     }
   }
 
@@ -80,7 +89,15 @@ export class MusicHandler {
   }
 
   public async handleClientRequest(request: SocketData): Promise<void> {
-    if (!this.currentApp) return
+    if (!this.currentApp) {
+      const settings = await settingsStore.getSettings()
+      if (settings.playbackLocation) {
+        this.currentApp = settings.playbackLocation
+      } else {
+        dataListener.asyncEmit(MESSAGE_TYPES.ERROR, `[MusicHandler]: No playback location set!`)
+        return
+      }
+    }
     if (request.app != 'music' && request.app != 'utility') return
 
     if (request.app == 'utility') {
diff --git a/DeskThingServer/src/renderer/src/overlays/settings/MusicSettings.tsx b/DeskThingServer/src/renderer/src/overlays/settings/MusicSettings.tsx
index 313fe0dc..6a2b7bb8 100644
--- a/DeskThingServer/src/renderer/src/overlays/settings/MusicSettings.tsx
+++ b/DeskThingServer/src/renderer/src/overlays/settings/MusicSettings.tsx
@@ -24,6 +24,7 @@ const MusicSettings: React.FC = () => {
 
   const handleSettingChange = (key: string, value: string | boolean | number | string[]): void => {
     setSettings({ ...settings, [key]: value })
+    console.log('Settings Updated:', settings)
   }
 
   const handleSave = async (): Promise<void> => {
@@ -79,6 +80,7 @@ const MusicSettings: React.FC = () => {
           onChange={(e) => {
             handleSettingChange('playbackLocation', e.target.value)
           }}
+          defaultValue={'Unset'}
           className="bg-zinc-900 rounded hover:cursor-pointer text-white px-2 py-2"
         >
           {audioSources.map((app) => (