ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash when backing to kart selection screen

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5407 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2010-05-07 17:31:57 +00:00
parent ea42e26e8b
commit 6187f3a132
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/guiengine/widgets/dynamic_ribbon_widget.cpp
View File

@@ -346,6 +346,8 @@ void DynamicRibbonWidget::elementRemoved()
m_rows.clearWithoutDeleting();
m_left_widget = NULL;
m_right_widget = NULL;
m_hover_listeners.clearAndDeleteAll();
}

8
src/guiengine/widgets/dynamic_ribbon_widget.hpp
View File

@@ -207,8 +207,12 @@ namespace GUIEngine
'updateItemDisplay' to update the display. */
void clearItems();
/** Register a listener to be notified of selection changes within the ribbon.
* The ribbon takes ownership of this listener and will delete it. */
/**
* \brief Register a listener to be notified of selection changes within the ribbon.
* \note The ribbon takes ownership of this listener and will delete it.
* \note The listener will be deleted upon leaving the screen, so you will likely
* want to add a listener in the "init" callback of your screen.
*/
void registerHoverListener(DynamicRibbonHoverListener* listener);
/** Called when right key is pressed */

11
src/states_screens/kart_selection.cpp
View File

@@ -698,7 +698,6 @@ public:
m_parent->validateKartChoices();
}
};
KartHoverListener* karthoverListener = NULL;
#if 0
#pragma mark -
@@ -773,11 +772,10 @@ void KartSelectionScreen::init()
DynamicRibbonWidget* w = this->getWidget<DynamicRibbonWidget>("karts");
assert( w != NULL );
if (karthoverListener == NULL)
{
karthoverListener = new KartHoverListener(this);
w->registerHoverListener(karthoverListener);
}
KartHoverListener* karthoverListener = new KartHoverListener(this);
w->registerHoverListener(karthoverListener);
// Build kart list (it is built everytime, to account for .g. locking)
setKartsFromCurrentGroup();
@@ -827,7 +825,6 @@ void KartSelectionScreen::unloaded()
{
// these pointers are no more valid (have been deleted along other widgets)
g_dispatcher = NULL;
karthoverListener = NULL;
}
// -----------------------------------------------------------------------------