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

Fix Deskbar crash when scroll arrows are removed.

Browse Source 
fExpando is added and removed from InlineScrollView only and it is
created and destroyed in BarView only. Before this there was a
case where it was removed in both InlineScrollView and BarView
causing a crash from the double remove
This commit is contained in:
John Scipione
2012-11-12 22:03:25 -05:00
parent 3135d0e0de
commit b4c922197c
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/BarView.cpp
+6 -9
View File
@@ -445,20 +445,17 @@ TBarView::PlaceApplicationBar()
{ {
if (fInlineScrollView != NULL) if (fInlineScrollView != NULL)
fInlineScrollView->DetachScrollers(); fInlineScrollView->DetachScrollers();
if (fExpando != NULL) {
SaveExpandedItems();
fExpando->RemoveSelf();
delete fExpando;
fExpando = NULL;
}
if (fInlineScrollView != NULL) {
fInlineScrollView->RemoveSelf(); fInlineScrollView->RemoveSelf();
delete fInlineScrollView; delete fInlineScrollView;
fInlineScrollView = NULL; fInlineScrollView = NULL;
} }
if (fExpando != NULL) {
SaveExpandedItems();
delete fExpando;
fExpando = NULL;
}
BRect screenFrame = (BScreen(Window())).Frame(); BRect screenFrame = (BScreen(Window())).Frame();
if (fState == kMiniState) { if (fState == kMiniState) {
SizeWindow(screenFrame); SizeWindow(screenFrame);