Changeset 8411

Timestamp:

May 6, 2011, 4:40:30 AM (14 years ago)

Author:

rgrieder

Message:

Properly initialise all members in CEGUI. Avoid segfaults when an exception is thrown.

Location:

code/trunk/src/libraries/core

Files:

• GUIManager.cc (modified) (2 diffs)
• GUIManager.h (modified) (1 diff)

code/trunk/src/libraries/core/GUIManager.cc

@@ -166 +166 @@
         , resourceProvider_(NULL)
 #ifndef ORXONOX_OLD_CEGUI
+        , rqListener_(NULL)
         , imageCodec_(NULL)
 #endif
@@ -171 +172 @@
         , scriptModule_(NULL)
         , guiSystem_(NULL)
+        , ceguiLogger_(NULL)
+        , rootWindow_(NULL)
+        , hudRootWindow_(NULL)
+        , menuRootWindow_(NULL)
         , camera_(NULL)
     {

code/trunk/src/libraries/core/GUIManager.h

@@ -165 +165 @@
 #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