From 5ce1f50fab6456afcd5adc781a0e141ea13e6e5b Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Thu, 10 Oct 2013 23:06:37 +0200
Subject: [PATCH] Cleanup in MWGui::WindowManager constructor initialzation
 list.

Corrected order of initialization list, and added missing
member field initializations - without this openmw crashes when
installer is interrupted and there are no valid data path
in openmw.cfg, as reported by BrotherBrick in:

https://forum.openmw.org/viewtopic.php?f=20&p=19501#p19499

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
 apps/openmw/mwgui/windowmanagerimp.cpp | 33 ++++++++++++++++----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index bf8b664da..4b4d2dfd1 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -61,20 +61,23 @@ namespace MWGui
         const Compiler::Extensions& extensions, int fpsLevel, OEngine::Render::OgreRenderer *ogre,
             const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts,
             Translation::Storage& translationDataStorage, ToUTF8::FromType encoding)
-      : mGuiManager(NULL)
-      , mConsoleOnlyScripts(consoleOnlyScripts)
+      : mConsoleOnlyScripts(consoleOnlyScripts)
+      , mGuiManager(NULL)
       , mRendering(ogre)
       , mHud(NULL)
       , mMap(NULL)
       , mMenu(NULL)
-      , mStatsWindow(NULL)
       , mToolTips(NULL)
+      , mStatsWindow(NULL)
       , mMessageBoxManager(NULL)
       , mConsole(NULL)
       , mJournal(NULL)
       , mDialogueWindow(NULL)
-      , mBookWindow(NULL)
+      , mContainerWindow(NULL)
+      , mDragAndDrop(NULL)
+      , mInventoryWindow(NULL)
       , mScrollWindow(NULL)
+      , mBookWindow(NULL)
       , mCountDialog(NULL)
       , mTradeWindow(NULL)
       , mSpellBuyingWindow(NULL)
@@ -83,27 +86,37 @@ namespace MWGui
       , mConfirmationDialog(NULL)
       , mAlchemyWindow(NULL)
       , mSpellWindow(NULL)
+      , mQuickKeysMenu(NULL)
       , mLoadingScreen(NULL)
-      , mCharGen(NULL)
       , mLevelupDialog(NULL)
       , mWaitDialog(NULL)
       , mSpellCreationDialog(NULL)
       , mEnchantingDialog(NULL)
       , mTrainingWindow(NULL)
       , mMerchantRepair(NULL)
-      , mRepair(NULL)
       , mSoulgemDialog(NULL)
+      , mRepair(NULL)
       , mCompanionWindow(NULL)
+      , mTranslationDataStorage (translationDataStorage)
+      , mSoftwareCursor(NULL)
+      , mCharGen(NULL)
+      , mInputBlocker(NULL)
+      , mCrosshairEnabled(Settings::Manager::getBool ("crosshair", "HUD"))
+      , mSubtitlesEnabled(Settings::Manager::getBool ("subtitles", "GUI"))
+      , mHudEnabled(true)
+      , mCursorVisible(true)
       , mPlayerName()
       , mPlayerRaceId()
       , mPlayerAttributes()
-      , mPlayerMajorSkills()
       , mPlayerMinorSkills()
+      , mPlayerMajorSkills()
       , mPlayerSkillValues()
       , mPlayerHealth()
       , mPlayerMagicka()
       , mPlayerFatigue()
       , mGui(NULL)
+      , mGuiModes()
+      , mCursorManager(NULL)
       , mGarbageDialogs()
       , mShown(GW_ALL)
       , mForceHidden(GW_None)
@@ -113,13 +126,7 @@ namespace MWGui
       , mFPS(0.0f)
       , mTriangleCount(0)
       , mBatchCount(0)
-      , mCrosshairEnabled(Settings::Manager::getBool ("crosshair", "HUD"))
-      , mSubtitlesEnabled(Settings::Manager::getBool ("subtitles", "GUI"))
-      , mHudEnabled(true)
-      , mTranslationDataStorage (translationDataStorage)
-      , mCursorManager(NULL)
       , mUseHardwareCursors(Settings::Manager::getBool("hardware cursors", "GUI"))
-      , mCursorVisible(true)
     {
         // Set up the GUI system
         mGuiManager = new OEngine::GUI::MyGUIManager(mRendering->getWindow(), mRendering->getScene(), false, logpath);