Merge pull request #276 from MediaPortal/MP1-5199-Fix_volume_OSD_pres…

…entation_on_the_screen MP1-5199: Fix volume OSD presentation on the screen
MediaPortal · Feb 23, 2024 · 74d95a0 · 74d95a0
2 parents 3c65b50 + 135ace2
commit 74d95a0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/mediaportal/Configuration/Sections/GeneralVolume.cs b/mediaportal/Configuration/Sections/GeneralVolume.cs
@@ -78,8 +78,8 @@ public override void LoadSettings()
       {
         string isSettingExist = reader.GetValueAsString("volume", "handler", "");
         int volumeStyle = reader.GetValueAsInt("volume", "handler", 1);
-        bool isDigital = reader.GetValueAsBool("volume", "digital", true);
-        mpCBHideWinOSD.Checked = reader.GetValueAsBool("volume", "hideWindowsOSD", false);
+        bool isDigital = reader.GetValueAsBool("volume", "digital", false);
+        mpCBHideWinOSD.Checked = reader.GetValueAsBool("volume", "hideWindowsOSD", true);
 
         _useClassicHandler.Checked = volumeStyle == 0;
         _useWindowsHandler.Checked = volumeStyle == 1;

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;
     }