[Orxonox-commit 3731] r8411 - code/trunk/src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-05-06 04:40:30 +0200 (Fri, 06 May 2011)
New Revision: 8411

Modified:
   code/trunk/src/libraries/core/GUIManager.cc
   code/trunk/src/libraries/core/GUIManager.h
Log:
Properly initialise all members in CEGUI. Avoid segfaults when an exception is thrown.

Modified: code/trunk/src/libraries/core/GUIManager.cc
===================================================================
--- code/trunk/src/libraries/core/GUIManager.cc	2011-05-06 02:39:20 UTC (rev 8410)
+++ code/trunk/src/libraries/core/GUIManager.cc	2011-05-06 02:40:30 UTC (rev 8411)
@@ -165,11 +165,16 @@
         , guiRenderer_(NULL)
         , resourceProvider_(NULL)
 #ifndef ORXONOX_OLD_CEGUI
+        , rqListener_(NULL)
         , imageCodec_(NULL)
 #endif
         , luaState_(NULL)
         , scriptModule_(NULL)
         , guiSystem_(NULL)
+        , ceguiLogger_(NULL)
+        , rootWindow_(NULL)
+        , hudRootWindow_(NULL)
+        , menuRootWindow_(NULL)
         , camera_(NULL)
     {
         RegisterRootObject(GUIManager);

Modified: code/trunk/src/libraries/core/GUIManager.h
===================================================================
--- code/trunk/src/libraries/core/GUIManager.h	2011-05-06 02:39:20 UTC (rev 8410)
+++ code/trunk/src/libraries/core/GUIManager.h	2011-05-06 02:40:30 UTC (rev 8411)
@@ -164,8 +164,8 @@
         CEGUI::ResourceProvider*             resourceProvider_; //!< CEGUI's resource provider
 #else
         CEGUI::OgreRenderer*                 guiRenderer_;      //!< CEGUI's interface to the Ogre Engine
+        CEGUI::OgreResourceProvider*         resourceProvider_; //!< CEGUI's resource provider
         Ogre::RenderQueueListener*           rqListener_;       //!< RQ listener so we can draw UNDER Ogre overlays
-        CEGUI::OgreResourceProvider*         resourceProvider_; //!< CEGUI's resource provider
         CEGUI::OgreImageCodec*               imageCodec_;
 #endif
         LuaState*                            luaState_;         //!< LuaState, access point to the Lua engine