From 045317ccd1d56c892a29b5117eb65017a73ea676 Mon Sep 17 00:00:00 2001 From: auria Date: Sat, 28 Aug 2010 01:02:13 +0000 Subject: [PATCH] Fixed crash due to uninitialized variable in abstract top level container git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5795 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/guiengine/abstract_top_level_container.cpp | 6 ++++++ src/guiengine/abstract_top_level_container.hpp | 1 + src/guiengine/screen.cpp | 2 -- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/guiengine/abstract_top_level_container.cpp b/src/guiengine/abstract_top_level_container.cpp index 8f257a8ef..9de09ec21 100644 --- a/src/guiengine/abstract_top_level_container.cpp +++ b/src/guiengine/abstract_top_level_container.cpp @@ -34,6 +34,12 @@ using namespace video; using namespace io; using namespace gui; +AbstractTopLevelContainer::AbstractTopLevelContainer() +{ + m_first_widget = NULL; + m_last_widget = NULL; +} + void AbstractTopLevelContainer::addWidgetsRecursively(ptr_vector& widgets, Widget* parent) { const unsigned short widgets_amount = widgets.size(); diff --git a/src/guiengine/abstract_top_level_container.hpp b/src/guiengine/abstract_top_level_container.hpp index f6371b93f..f26c614f9 100644 --- a/src/guiengine/abstract_top_level_container.hpp +++ b/src/guiengine/abstract_top_level_container.hpp @@ -52,6 +52,7 @@ namespace GUIEngine public: + AbstractTopLevelContainer(); virtual ~AbstractTopLevelContainer() {} virtual int getWidth() = 0; diff --git a/src/guiengine/screen.cpp b/src/guiengine/screen.cpp index 5e6f30ba7..8a20dd8a9 100644 --- a/src/guiengine/screen.cpp +++ b/src/guiengine/screen.cpp @@ -52,8 +52,6 @@ Screen::Screen(const char* file, bool pause_race) m_throttle_FPS = true; m_render_3d = false; m_loaded = false; - m_first_widget = NULL; - m_last_widget = NULL; m_pause_race = pause_race; } // Screen