From 1608d342c064f79b239e4671da516d270445b385 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 25 Jul 2015 16:28:30 +0300
Subject: Move some init code from Client::gameExec into Client::gameInit.

---
 src/client.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index adf2ffdb2..5bd3bd163 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -455,6 +455,18 @@ void Client::gameInit()
     WindowManager::updateScreenKeyboard(SDL_GetScreenKeyboardHeight(nullptr));
 #endif
 #endif
+
+#ifdef USE_MUMBLE
+    if (!mumbleManager)
+        mumbleManager = new MumbleManager();
+#endif
+
+    mSkin = theme->load("windowmenu.xml", "");
+    if (mSkin)
+    {
+        mButtonPadding = mSkin->getPadding();
+        mButtonSpacing = mSkin->getOption("spacing", 3);
+    }
 }
 
 Client::~Client()
@@ -689,18 +701,6 @@ int Client::gameExec()
 {
     int lastTickTime = tick_time;
 
-#ifdef USE_MUMBLE
-    if (!mumbleManager)
-        mumbleManager = new MumbleManager();
-#endif
-
-    mSkin = theme->load("windowmenu.xml", "");
-    if (mSkin)
-    {
-        mButtonPadding = mSkin->getPadding();
-        mButtonSpacing = mSkin->getOption("spacing", 3);
-    }
-
     while (mState != STATE_EXIT)
     {
         PROFILER_START();
-- 
cgit v1.2.3-60-g2f50