Merge pull request #1085 from Areloch/AudioOptionsUpdateFix

Fixes the issue of changing audio settings causing the SFX re-init'ing to fail
TorqueGameEngines · Sep 11, 2023 · 626de07 · 626de07
2 parents af9ae4c + 2a390e9
commit 626de07
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript b/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript
@@ -685,7 +685,7 @@ function populateAudioSettingsList()
       }
    }
 
-   OptionsMenuSettingsList.addOptionRow("Audio Provider", "$pref::SFX::AudioProvider", %audioProviderList, false, "audioProviderChanged", true, "");
+   OptionsMenuSettingsList.addOptionRow("Audio Provider", "$pref::SFX::provider", %audioProviderList, false, "audioProviderChanged", true, "");
    OptionsMenuSettingsList.addOptionRow("Audio Device", "$pref::SFX::device", %audioDeviceList, false, "", true);
 
    OptionsMenuSettingsList.addSliderRow("Master Volume", "$pref::SFX::masterVolume", 0.1, "0 1", "");

diff --git a/Templates/BaseGame/game/data/defaults.tscript b/Templates/BaseGame/game/data/defaults.tscript
@@ -82,10 +82,6 @@ $pref::SFX::autoDetect = true;
 /// plays no sound.
 $pref::SFX::provider = "OpenAL";
 
-/// The sound device to select from the provider.  Each
-/// provider may have several different devices.
-$pref::SFX::device = "OpenAL Soft";
-
 /// If true the device will try to use hardware buffers
 /// and sound mixing.  If not it will use software.
 $pref::SFX::useHardware = false;