summaryrefslogtreecommitdiff
path: root/drivers/alsa
diff options
context:
space:
mode:
authorEoin O'Neill <eoinoneill1991@gmail.com>2022-12-09 22:39:14 -0800
committerYuri Sizov <yuris@humnom.net>2023-04-26 14:51:00 +0200
commit5120afc236c9d6425bc77ea03c93a7a5d5169a08 (patch)
tree90a92166837b1e3b574a7e6626b937ac4474ba70 /drivers/alsa
parent4b4556179e541ef100202a1270e678f3bcac7fb6 (diff)
Fix crash caused by invalid mix_rate assignment due to bogus
project settings. We'll default to a sensible value in the case that a user has somehow managed to modify the configuration file incorrectly. Closes 69819 (cherry picked from commit 5a08091168782a924cd3a23baf31c5cd4cd63906)
Diffstat (limited to 'drivers/alsa')
-rw-r--r--drivers/alsa/audio_driver_alsa.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/alsa/audio_driver_alsa.cpp b/drivers/alsa/audio_driver_alsa.cpp
index 689f76389b..a6673f974e 100644
--- a/drivers/alsa/audio_driver_alsa.cpp
+++ b/drivers/alsa/audio_driver_alsa.cpp
@@ -44,7 +44,8 @@ extern int initialize_pulse(int verbose);
#endif
Error AudioDriverALSA::init_output_device() {
- mix_rate = GLOBAL_GET("audio/driver/mix_rate");
+ mix_rate = _get_configured_mix_rate();
+
speaker_mode = SPEAKER_MODE_STEREO;
channels = 2;