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:
parent
3fcf8a6ac5
commit
167898484d
|
@ -2386,10 +2386,16 @@ bool
|
||||||
FSIsDeskDir(const BEntry *entry, dev_t device)
|
FSIsDeskDir(const BEntry *entry, dev_t device)
|
||||||
{
|
{
|
||||||
BVolume volume(device);
|
BVolume volume(device);
|
||||||
|
|
||||||
status_t result = volume.InitCheck();
|
status_t result = volume.InitCheck();
|
||||||
if (result != B_OK)
|
if (result != B_OK)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
BVolume bootvolume;
|
||||||
|
BVolumeRoster roster;
|
||||||
|
if (roster.GetBootVolume(&bootvolume) == B_OK && volume != bootvolume)
|
||||||
|
return false;
|
||||||
|
|
||||||
BPath path;
|
BPath path;
|
||||||
result = find_directory(B_DESKTOP_DIRECTORY, &path, true, &volume);
|
result = find_directory(B_DESKTOP_DIRECTORY, &path, true, &volume);
|
||||||
if (result != B_OK)
|
if (result != B_OK)
|
||||||
|
|
Loading…
Reference in New Issue