Simplified FSIsDeskDir() as suggested by Axel. Thanks!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35082 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
5a1d355fdf
commit
7b6edf5209
@ -2385,19 +2385,8 @@ FSIsTrashDir(const BEntry *entry)
|
||||
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);
|
||||
status_t result = find_directory(B_DESKTOP_DIRECTORY, &path, true);
|
||||
if (result != B_OK)
|
||||
return false;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user