MP1-5199: Core: VolumeHandler: Restore Windows Volume OSD on dispose

MediaPortal · Feb 23, 2024 · 37b6913 · 37b6913
1 parent 3739754
commit 37b6913
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/mediaportal/Core/Player/VolumeHandler.cs b/mediaportal/Core/Player/VolumeHandler.cs
@@ -109,7 +109,9 @@ public VolumeHandler(int[] volumeTable)
 
                 _showVolumeOSD = true;
 
-                VolumeOSD = new HideVolumeOSD.HideVolumeOSDLib(IsMuted);
+                if (VolumeOSD == null)
+                  VolumeOSD = new HideVolumeOSD.HideVolumeOSDLib(IsMuted);
+
                 VolumeOSD.HideOSD();
 
                 _showVolumeOSD = tempShowVolumeOSD;
@@ -174,7 +176,9 @@ public VolumeHandler(int[] volumeTable)
 
               _showVolumeOSD = true;
 
-              VolumeOSD = new HideVolumeOSD.HideVolumeOSDLib(IsMuted);
+              if (VolumeOSD == null)
+                VolumeOSD = new HideVolumeOSD.HideVolumeOSDLib(IsMuted);
+
               VolumeOSD.HideOSD();
 
               _showVolumeOSD = tempShowVolumeOSD;
@@ -368,6 +372,11 @@ public static void Dispose()
         _instance._mixer.SafeDispose();
         _instance._mixer = null;
       }
+
+      //Restore native Windows Volume OSD
+      if (VolumeOSD != null)
+        VolumeOSD.ShowOSD();
+
       _instance = null;
       GUIGraphicsContext.VolumeHandler = null;
     }