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

FSIsDeskDir should only consider a path to be the desktop if it lives on the boot volume. Fixes non-boot Desktop dirs still showing the volumes and such in windows and nav menus. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35065 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent 2010-01-13 23:50:53 +00:00
parent 3fcf8a6ac5
commit 167898484d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/kits/tracker/FSUtils.cpp
View File

@ -2386,10 +2386,16 @@ bool
FSIsDeskDir(const BEntry *entry, dev_t device)
{
BVolume volume(device);
status_t result = volume.InitCheck();
if (result != B_OK)
return false;
BVolume bootvolume;
BVolumeRoster roster;
if (roster.GetBootVolume(&bootvolume) == B_OK && volume != bootvolume)
return false;
BPath path;
result = find_directory(B_DESKTOP_DIRECTORY, &path, true, &volume);
if (result != B_OK)