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

Use dynamic_cast before calling DeleteReplicant. This fixes bug #2712. I'm not sure why, though. Also call unload_add_on() as last operation (and yes, doing just that was not sufficient to fix the bug)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27400 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2008-09-10 11:34:56 +00:00
parent de2dcd9ab0
commit 40b71c1667
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Shelf.cpp
+10 -6
View File
@@ -531,10 +531,12 @@ void
BShelf::MessageReceived(BMessage *msg) BShelf::MessageReceived(BMessage *msg)
{ {
if (msg->what == kDeleteReplicant) { if (msg->what == kDeleteReplicant) {
BView *replicant = NULL; BHandler *replicant = NULL;
if (msg->FindPointer("_target", (void **)&replicant) == B_OK && replicant != NULL) if (msg->FindPointer("_target", (void **)&replicant) == B_OK) {
DeleteReplicant(replicant); BView *view = dynamic_cast<BView *>(replicant);
if (view != NULL)
DeleteReplicant(view);
}
return; return;
} }
@@ -1152,11 +1154,13 @@ BShelf::_DeleteReplicant(replicant_data* item)
delete item->dragger; delete item->dragger;
} }
if (loadedImage && item->image >= 0) image_id image = item->image;
unload_add_on(item->image);
delete item; delete item;
if (loadedImage && image >= 0)
unload_add_on(image);
return B_OK; return B_OK;
} }