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

If there was a BMenuItem view with shortcut, it tried to delete the shortcut twice

Browse Source 
(as the shortcut list wasn't emptied), courtesy of Stippi.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15866 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-01-08 13:05:33 +00:00
parent 8c7229ddbe
commit ea34f0f03b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Window.cpp
+3 -3
View File
@@ -312,15 +312,15 @@ BWindow::BWindow(BRect frame, int32 bitmapToken)
BWindow::~BWindow() BWindow::~BWindow()
{ {
fTopView->RemoveSelf();
delete fTopView;
// remove all existing shortcuts // remove all existing shortcuts
int32 noOfItems = fShortcuts.CountItems(); int32 noOfItems = fShortcuts.CountItems();
for (int32 index = noOfItems - 1; index >= 0; index--) { for (int32 index = noOfItems - 1; index >= 0; index--) {
delete (Shortcut *)fShortcuts.ItemAt(index); delete (Shortcut *)fShortcuts.ItemAt(index);
} }
fTopView->RemoveSelf();
delete fTopView;
// TODO: release other dynamically-allocated objects // TODO: release other dynamically-allocated objects
// Deleting this semaphore will tell open menus to quit. // Deleting this semaphore will tell open menus to quit.