aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornOOb3167 <nOOb3167@gmail.com>2018-03-29 21:43:57 +0200
committerSmallJoker <SmallJoker@users.noreply.github.com>2018-03-29 21:43:57 +0200
commit376ed5cd3c0c61135230a2a14b873436d551d266 (patch)
tree4710a93c0d464bde5eeaf2935770bcb8252819f7
parent821e3f7072b040f57e33785536a4f00a064a0069 (diff)
downloadminetest-376ed5cd3c0c61135230a2a14b873436d551d266.tar.gz
minetest-376ed5cd3c0c61135230a2a14b873436d551d266.tar.bz2
minetest-376ed5cd3c0c61135230a2a14b873436d551d266.zip
Sound: fix static initialization order dependency by not having one (#7168)
Ensure singleton is reset
-rw-r--r--src/client/clientlauncher.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index 2f8591179..051e4c242 100644
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -64,6 +64,10 @@ ClientLauncher::~ClientLauncher()
delete g_gamecallback;
delete RenderingEngine::get_instance();
+
+#if USE_SOUND
+ g_sound_manager_singleton.reset();
+#endif
}