[haiku-commits] r35065 - haiku/trunk/src/kits/tracker
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 14 Jan 2010 00:50:53 +0100 (CET)
Author: anevilyak
Date: 2010-01-14 00:50:53 +0100 (Thu, 14 Jan 2010)
New Revision: 35065
Changeset: http://dev.haiku-os.org/changeset/35065/haiku
Modified:
haiku/trunk/src/kits/tracker/FSUtils.cpp
Log:
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.
Modified: haiku/trunk/src/kits/tracker/FSUtils.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FSUtils.cpp 2010-01-13 23:12:33 UTC (rev
35064)
+++ haiku/trunk/src/kits/tracker/FSUtils.cpp 2010-01-13 23:50:53 UTC (rev
35065)
@@ -2386,10 +2386,16 @@
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)
Other related posts:
