[Supertuxkart-commit] SF.net SVN: supertuxkart:[13377] main/branches/uni/src/guiengine

[<uni...@us...>]

Revision: 13377
          http://sourceforge.net/p/supertuxkart/code/13377
Author:   unitraxx
Date:     2013-07-28 19:31:17 +0000 (Sun, 28 Jul 2013)
Log Message:
-----------
Some fixes to my GUI Engine additions, so that they are compatible with the rest of the game.

Modified Paths:
--------------
    main/branches/uni/src/guiengine/modaldialog.cpp
    main/branches/uni/src/guiengine/widgets/label_widget.cpp

Modified: main/branches/uni/src/guiengine/modaldialog.cpp
===================================================================
--- main/branches/uni/src/guiengine/modaldialog.cpp	2013-07-28 17:27:06 UTC (rev 13376)
+++ main/branches/uni/src/guiengine/modaldialog.cpp	2013-07-28 19:31:17 UTC (rev 13377)
@@ -187,7 +187,8 @@
 {
     if(modalWindow != NULL) delete modalWindow;
     modalWindow = NULL;
-    GUIEngine::getCurrentScreen()->onDialogClose();
+    if(GUIEngine::getCurrentScreen() != NULL)
+        GUIEngine::getCurrentScreen()->onDialogClose();
 }
 
 // ----------------------------------------------------------------------------

Modified: main/branches/uni/src/guiengine/widgets/label_widget.cpp
===================================================================
--- main/branches/uni/src/guiengine/widgets/label_widget.cpp	2013-07-28 17:27:06 UTC (rev 13376)
+++ main/branches/uni/src/guiengine/widgets/label_widget.cpp	2013-07-28 19:31:17 UTC (rev 13377)
@@ -128,12 +128,11 @@
 
 void LabelWidget::setText(const wchar_t *text, bool expandIfNeeded)
 {
-    assert(m_element != NULL);
     m_scroll_offset = 0;
 
     if (expandIfNeeded)
     {
-
+        assert(m_element != NULL);
         const int fwidth = (m_title_font ? GUIEngine::getTitleFont() : GUIEngine::getFont())->getDimension(text).Width;
         core::rect<s32> rect = m_element->getRelativePosition();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.