Fixed an issue causing a crash on device with no available audio output

CasperH2O · Apr 18, 2024 · 894c9a0 · 894c9a0
1 parent 7c721b0
commit 894c9a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/HandheldCompanion/UI/UISounds.cs b/HandheldCompanion/UI/UISounds.cs
@@ -54,6 +54,9 @@ private static async void SoundTimer_Elapsed(object? sender, ElapsedEventArgs e)
             {
                 using (WaveOutEvent waveOut = new WaveOutEvent())
                 {
+                    if (waveOut.DeviceNumber == -1)
+                        return;
+
                     waveOut.Init(waveReader);
                     waveOut.Play();
 

diff --git a/HandheldCompanion/Views/Pages/SettingsPage.xaml.cs b/HandheldCompanion/Views/Pages/SettingsPage.xaml.cs
@@ -159,6 +159,7 @@ private void SettingsManager_SettingValueChanged(string? name, object value)
                     Toggle_QuicktoolsAutoHide.IsOn = Convert.ToBoolean(value);
                     break;
                 case "UISounds":
+                    Toggle_UISounds.IsEnabled = MultimediaManager.HasVolumeSupport();
                     Toggle_UISounds.IsOn = Convert.ToBoolean(value);
                     break;
             }