From 6446b346af00be257834529b46d9124879f03bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=85=B0=EF=B8=8F=F0=9F=85=B0=EF=B8=8F=F0=9F=85=B0?=
 =?UTF-8?q?=EF=B8=8F1=EF=B8=8F=E2=83=A36=EF=B8=8F=E2=83=A32=EF=B8=8F?=
 =?UTF-8?q?=E2=83=A3=20=E2=9C=94=EF=B8=8F?= <admin@aaa162.live>
Date: Fri, 9 Jan 2026 00:19:19 -0600
Subject: [PATCH] fix: Music player UI freeze when changing volume during song
 transition

---
 .../ViewModel/MainControls/MusicPlayerMainControlViewModel.cs   | 2 +-
 MixItUp.WPF/Services/WindowsMusicPlayerService.cs               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MixItUp.Base/ViewModel/MainControls/MusicPlayerMainControlViewModel.cs b/MixItUp.Base/ViewModel/MainControls/MusicPlayerMainControlViewModel.cs
index bb0be3d83..dda25bbd3 100644
--- a/MixItUp.Base/ViewModel/MainControls/MusicPlayerMainControlViewModel.cs
+++ b/MixItUp.Base/ViewModel/MainControls/MusicPlayerMainControlViewModel.cs
@@ -41,7 +41,7 @@ public int Volume
             get { return ServiceManager.Get<IMusicPlayerService>().Volume; }
             set
             {
-                ServiceManager.Get<IMusicPlayerService>().ChangeVolume(value).Wait();
+                _ = ServiceManager.Get<IMusicPlayerService>().ChangeVolume(value);
                 this.NotifyPropertyChanged();
             }
         }
diff --git a/MixItUp.WPF/Services/WindowsMusicPlayerService.cs b/MixItUp.WPF/Services/WindowsMusicPlayerService.cs
index d13888f80..6d772735e 100644
--- a/MixItUp.WPF/Services/WindowsMusicPlayerService.cs
+++ b/MixItUp.WPF/Services/WindowsMusicPlayerService.cs
@@ -97,7 +97,7 @@ public async Task Play()
                         this.sempahore.Release();
                     }
 
-                    this.SongChanged.Invoke(this, new EventArgs());
+                    DispatcherHelper.Dispatcher.Invoke(() => this.SongChanged.Invoke(this, new EventArgs()));
 
                     await ServiceManager.Get<CommandService>().Queue(ChannelSession.Settings.MusicPlayerOnSongChangedCommandID, new CommandParametersModel(ChannelSession.User, platform: StreamingPlatformTypeEnum.All));
                 }