diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-17 22:48:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-17 22:48:22 +0200 |
| commit | 53bbc046ee670a1c24b1ec936066857ef6e73dc9 (patch) | |
| tree | 912835b1b1872785c0ffadda66d8996f5e7f9823 /platform/server/os_server.cpp | |
| parent | a00f19a92109ec33de41308e6277b55eb444320d (diff) | |
| parent | 7a4c0ff35e10fba5f2686e7fd5623eab31b07a2d (diff) | |
| download | redot-engine-53bbc046ee670a1c24b1ec936066857ef6e73dc9.tar.gz | |
Merge pull request #11252 from marcelofg55/fix_noaudio_crash
Fix crash when no audio driver is available
Diffstat (limited to 'platform/server/os_server.cpp')
| -rw-r--r-- | platform/server/os_server.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index e2bb464e76..300c5cffcc 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -62,12 +62,7 @@ void OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int p //visual_server = memnew( VisualServerRaster(rasterizer) ); - AudioDriverManager::get_driver(p_audio_driver)->set_singleton(); - - if (AudioDriverManager::get_driver(p_audio_driver)->init() != OK) { - - ERR_PRINT("Initializing audio failed."); - } + AudioDriverManager::initialize(p_audio_driver); sample_manager = memnew(SampleManagerMallocSW); audio_server = memnew(AudioServerSW(sample_manager)); @@ -232,7 +227,6 @@ void OS_Server::run() { OS_Server::OS_Server() { - AudioDriverManager::add_driver(&driver_dummy); //adriver here grab = false; }; |