From da281a170b29a50621d9251869cc68156cdf3d9f Mon Sep 17 00:00:00 2001
From: dank074 <torresefrain10@gmail.com>
Date: Tue, 15 Nov 2022 22:39:27 -0600
Subject: [PATCH] fix jukebox on null playlist

---
 .../widgets/furniture/playlist-editor/DiskInventoryView.tsx | 6 +++---
 .../widgets/furniture/playlist-editor/SongPlaylistView.tsx  | 2 +-
 .../widgets/furniture/useFurniturePlaylistEditorWidget.ts   | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/room/widgets/furniture/playlist-editor/DiskInventoryView.tsx b/src/components/room/widgets/furniture/playlist-editor/DiskInventoryView.tsx
index d354c06c..407fdce2 100644
--- a/src/components/room/widgets/furniture/playlist-editor/DiskInventoryView.tsx
+++ b/src/components/room/widgets/furniture/playlist-editor/DiskInventoryView.tsx
@@ -57,13 +57,13 @@ export const DiskInventoryView: FC<DiskInventoryViewProps> = props =>
                 {
                     const diskId = diskInventory.getKey(index);
                     const songId = diskInventory.getWithIndex(index);
-                    const songData = GetNitroInstance().soundManager.musicController?.getSongInfo(songId);
+                    const songInfo = GetNitroInstance().soundManager.musicController?.getSongInfo(songId);
 
                     return (
                         <LayoutGridItem key={ index } itemActive={ (selectedItem === index) } onClick={ () => setSelectedItem(prev => prev === index ? -1 : index) } classNames={ [ 'text-black' ] }>
-                            <div className="disk-image flex-shrink-0 mb-n2" style={ { backgroundColor: GetDiskColor(songData?.songData) } }>
+                            <div className="disk-image flex-shrink-0 mb-n2" style={ { backgroundColor: GetDiskColor(songInfo?.songData) } }>
                             </div>
-                            <Text truncate fullWidth className="text-center">{ songData?.name }</Text>
+                            <Text truncate fullWidth className="text-center">{ songInfo?.name }</Text>
                             { (selectedItem === index) &&
                                     <Flex position="absolute" className="bottom-0 mb-1 bg-secondary p-1 rounded" alignItems="center" justifyContent="center" gap={ 2 }>
                                         <Button onClick={ event => previewSong(event, songId) } variant="light">
diff --git a/src/components/room/widgets/furniture/playlist-editor/SongPlaylistView.tsx b/src/components/room/widgets/furniture/playlist-editor/SongPlaylistView.tsx
index ecfca469..241bdc5b 100644
--- a/src/components/room/widgets/furniture/playlist-editor/SongPlaylistView.tsx
+++ b/src/components/room/widgets/furniture/playlist-editor/SongPlaylistView.tsx
@@ -66,7 +66,7 @@ export const SongPlaylistView: FC<SongPlaylistViewProps> = props =>
                         <Flex column>
                             <Text bold display="block">{ LocalizeText('playlist.editor.text.now.playing.in.your.room') }</Text>
                             <Text>
-                                { playlist[currentPlayingIndex].name + ' - ' + playlist[currentPlayingIndex].creator }
+                                { playlist[currentPlayingIndex]?.name + ' - ' + playlist[currentPlayingIndex]?.creator }
                             </Text>
                         </Flex>
 
diff --git a/src/hooks/rooms/widgets/furniture/useFurniturePlaylistEditorWidget.ts b/src/hooks/rooms/widgets/furniture/useFurniturePlaylistEditorWidget.ts
index 6dee5bab..cdb41ddc 100644
--- a/src/hooks/rooms/widgets/furniture/useFurniturePlaylistEditorWidget.ts
+++ b/src/hooks/rooms/widgets/furniture/useFurniturePlaylistEditorWidget.ts
@@ -45,7 +45,7 @@ const useFurniturePlaylistEditorWidgetState = () =>
 
             return;
         }
-        
+
         if(roomSession.isRoomOwner || (roomSession.controllerLevel >= RoomControllerLevel.GUEST) || GetSessionDataManager().isModerator) SendMessageComposer(new FurnitureMultiStateComposer(event.objectId, -2));
     });
 
@@ -58,7 +58,6 @@ const useFurniturePlaylistEditorWidgetState = () =>
 
     useSoundEvent<NowPlayingEvent>(NowPlayingEvent.NPE_SONG_CHANGED, event =>
     {
-        console.log(event);
         setCurrentPlayingIndex(event.position);
     });