i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a crash bug I introduced to Deskbar last commit

Browse Source 
Need to set fLastClickedItem to NULL so it doesn't point to a deleted item.
Sorry about that.
This commit is contained in:
John Scipione
2013-04-07 03:29:11 -04:00
parent 5b0fd10d23
commit e6b6af80bd
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/ExpandoMenuBar.cpp
+4
View File
@@ -747,11 +747,15 @@ TExpandoMenuBar::RemoveTeam(team_id team, bool partial)
BAutolock locker(sMonLocker); BAutolock locker(sMonLocker);
// make the update thread wait // make the update thread wait
RemoveItem(i); RemoveItem(i);
if (item == fLastClickedItem)
fLastClickedItem = NULL;
delete item; delete item;
while ((windowItem = dynamic_cast<TWindowMenuItem*>( while ((windowItem = dynamic_cast<TWindowMenuItem*>(
ItemAt(i))) != NULL) { ItemAt(i))) != NULL) {
// Also remove window items (if there are any) // Also remove window items (if there are any)
RemoveItem(i); RemoveItem(i);
if (windowItem == fLastClickedItem)
fLastClickedItem = NULL;
delete windowItem; delete windowItem;
} }
SizeWindow(-1); SizeWindow(-1);