Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now always retrieve the team icon from the first B_APP_IMAGE image entry_ref. 

Using team_info.args as before was not safe: when truncated, the 
entry_ref could be an intermediate folder, which display a folder 
icon as team's icon!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42653 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin 2011-08-21 09:36:19 +00:00
parent 20fbef1e74
commit 727c05a5df
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/apps/debugger/user_interface/gui/teams_window/TeamsListView.cpp
View File

@ -229,8 +229,25 @@ TeamRow::_SetTo(team_info& info)
get_ref_for_path(kernelPath.Path(), &appInfo.ref);
}
} else {
BEntry entry(teamInfo.args, true);
entry.GetRef(&appInfo.ref);
// Not an application known to be_roster
// The teamInfo.args string is not safe and could be truncated.
// This could leads to show an intermediate folder icon!
//
// Let's retrieve instead the entry_ref from the first team's image of
// type B_APP_IMAGE
int32 cookie = 0;
image_info imageInfo;
while (get_next_image_info(teamInfo.team, &cookie, &imageInfo) == B_OK) {
if (imageInfo.type == B_APP_IMAGE) {
BPath imagePath(imageInfo.name);
appInfo.ref.device = imageInfo.device;
appInfo.ref.directory = imageInfo.node;
appInfo.ref.set_name(imagePath.Leaf());
break;
}
}
}
BBitmap* icon = new BBitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1), B_RGBA32);