Fixed CID 321, 868: check item for NULL and delete recource leak
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27453 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -703,6 +703,7 @@ ApplicationTypeWindow::_Save()
|
|||||||
SupportedTypeItem* item = dynamic_cast<SupportedTypeItem*>(
|
SupportedTypeItem* item = dynamic_cast<SupportedTypeItem*>(
|
||||||
fTypeListView->ItemAt(i));
|
fTypeListView->ItemAt(i));
|
||||||
|
|
||||||
|
if (item != NULL)
|
||||||
supportedTypes.AddString("types", item->Type());
|
supportedTypes.AddString("types", item->Type());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -735,6 +736,7 @@ ApplicationTypeWindow::_Save()
|
|||||||
SupportedTypeItem* item = dynamic_cast<SupportedTypeItem*>(
|
SupportedTypeItem* item = dynamic_cast<SupportedTypeItem*>(
|
||||||
fTypeListView->ItemAt(i));
|
fTypeListView->ItemAt(i));
|
||||||
|
|
||||||
|
if (item != NULL)
|
||||||
item->Icon().CopyTo(info, item->Type(), true);
|
item->Icon().CopyTo(info, item->Type(), true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -591,10 +591,15 @@ IconView::MessageReceived(BMessage* message)
|
|||||||
|
|
||||||
if (large != NULL || mini != NULL || (data != NULL && size > 0))
|
if (large != NULL || mini != NULL || (data != NULL && size > 0))
|
||||||
_SetIcon(large, mini, data, size);
|
_SetIcon(large, mini, data, size);
|
||||||
|
else {
|
||||||
entry_ref ref;
|
entry_ref ref;
|
||||||
if (message->FindRef("refs", &ref) == B_OK)
|
if (message->FindRef("refs", &ref) == B_OK)
|
||||||
_SetIcon(&ref);
|
_SetIcon(&ref);
|
||||||
|
}
|
||||||
|
|
||||||
|
delete(large);
|
||||||
|
delete(mini);
|
||||||
|
delete(data);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user