From c06ea3447d338fff0f73bb9c8e9c7fcdb10205b4 Mon Sep 17 00:00:00 2001 From: Deve Date: Sun, 9 Apr 2017 09:26:03 +0200 Subject: [PATCH] Revert "Move loadSfx to the SFXManager thread" This reverts commit ce426d82cc5988b82b8f35eadfd3e61198df2159. --- src/audio/sfx_manager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp index 94e32b445..3484af6ab 100644 --- a/src/audio/sfx_manager.cpp +++ b/src/audio/sfx_manager.cpp @@ -83,6 +83,8 @@ SFXManager::SFXManager() m_listener_front = Vec3(0, 0, 1); m_listener_up = Vec3(0, 1, 0); + loadSfx(); + pthread_cond_init(&m_cond_request, NULL); pthread_attr_t attr; @@ -294,7 +296,6 @@ void* SFXManager::mainLoop(void *obj) VS::setThreadName("SFXManager"); SFXManager *me = (SFXManager*)obj; - me->loadSfx(); me->m_sfx_commands.lock(); // Wait till we have an empty sfx in the queue