diff options
| author | Gustav Lund | 2016-12-12 08:26:22 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-01-12 19:15:27 +0100 |
| commit | f10a78e5c0fbc75f60991189e203bdf675cb4a71 (patch) | |
| tree | ea322e2e0190c4edf639845465555ed86071cb69 | |
| parent | 5354d7ddcca1a37594c6c738743f5f68009ae2bd (diff) | |
| download | godot-f10a78e5c0fbc75f60991189e203bdf675cb4a71.tar.gz godot-f10a78e5c0fbc75f60991189e203bdf675cb4a71.tar.zst godot-f10a78e5c0fbc75f60991189e203bdf675cb4a71.zip | |
fix for crash when no ALSA or Pulse installed on linux
(cherry picked from commit 2495e8a9410d8b6e21628ea26814148617d5327f)
| -rw-r--r-- | platform/x11/os_x11.cpp | 5 | ||||
| -rw-r--r-- | platform/x11/os_x11.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 0172dca4c..0179480ef 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1990,6 +1990,11 @@ OS_X11::OS_X11() { AudioDriverManagerSW::add_driver(&driver_alsa); #endif + if(AudioDriverManagerSW::get_driver_count() == 0){ + WARN_PRINT("No sound driver found... Defaulting to dummy driver"); + AudioDriverManagerSW::add_driver(&driver_dummy); + } + minimized = false; xim_style=0L; mouse_mode=MOUSE_MODE_VISIBLE; diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index efa7e44af..617e49e98 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -44,6 +44,7 @@ #include "drivers/rtaudio/audio_driver_rtaudio.h" #include "drivers/alsa/audio_driver_alsa.h" #include "drivers/pulseaudio/audio_driver_pulseaudio.h" +#include "servers/audio/audio_driver_dummy.h" #include "servers/physics_2d/physics_2d_server_sw.h" #include "servers/physics_2d/physics_2d_server_wrap_mt.h" #include "main/input_default.h" @@ -168,6 +169,7 @@ class OS_X11 : public OS_Unix { #ifdef PULSEAUDIO_ENABLED AudioDriverPulseAudio driver_pulseaudio; #endif + AudioDriverDummy driver_dummy; Atom net_wm_icon; |