From: Tobias Markus <tobbi@mozilla-uk.org>
Date: Thu, 19 Mar 2015 23:45:43 +0000 (+0100)
Subject: Revert "Load audio earlier in the process. Might save us some time"
X-Git-Url: https://git.octo.it/?p=supertux.git;a=commitdiff_plain;h=b9f40748d04747d81cf79812a900e380d8f45c72

Revert "Load audio earlier in the process. Might save us some time"

This reverts commit c0e497c19521c1868f44c0fd21bbf666a66654be.
---

diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp
index 17571a3c8..1cfba9c4c 100644
--- a/src/supertux/main.cpp
+++ b/src/supertux/main.cpp
@@ -299,11 +299,6 @@ Main::launch_game()
   SDLSubsystem sdl_subsystem;
   ConsoleBuffer console_buffer;
 
-  timelog("audio");
-  SoundManager sound_manager;
-  sound_manager.enable_sound(g_config->sound_enabled);
-  sound_manager.enable_music(g_config->music_enabled);
-
   timelog("controller");
   InputManager input_manager(g_config->keyboard_config, g_config->joystick_config);
 
@@ -314,6 +309,11 @@ Main::launch_game()
   DrawingContext context(*video_system);
   init_video();
 
+  timelog("audio");
+  SoundManager sound_manager;
+  sound_manager.enable_sound(g_config->sound_enabled);
+  sound_manager.enable_music(g_config->music_enabled);
+
   Console console(console_buffer);
 
   timelog("scripting");