summaryrefslogtreecommitdiff
path: root/platform/x11/os_x11.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-07-25 19:28:36 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-07-25 19:28:36 -0300
commit18cbcdafbaa047d97d03dcf3cba36f384e242158 (patch)
treeeba98409ea1b2e8ef3eb1cf431e074bc8cc65355 /platform/x11/os_x11.cpp
parentd50ebbb441cd6e1d2227d26cc168e76c7bff2b62 (diff)
parent983fd0dfc3d9bb9c99ebbbd6dd9d312561980ecb (diff)
Merge pull request #2298 from ronchaine/ronchaine-devel
Fix audio driver loading if the first tried driver fails (linux-x11).
Diffstat (limited to 'platform/x11/os_x11.cpp')
-rw-r--r--platform/x11/os_x11.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index f8c570a5c0..b34d1ba7c8 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -267,6 +267,7 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
for(int i=0;i<AudioDriverManagerSW::get_driver_count();i++) {
if (i==p_audio_driver)
continue;
+ AudioDriverManagerSW::get_driver(i)->set_singleton();
if (AudioDriverManagerSW::get_driver(i)->init()==OK) {
success=true;
print_line("Audio Driver Failed: "+String(AudioDriverManagerSW::get_driver(p_audio_driver)->get_name()));