summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2014-07-12 17:12:30 -0500
committerTimothy Pearson <[email protected]>2014-07-12 17:12:30 -0500
commit96f718bb7eeb9e2047223efc7b30cbc0ec8b0ded (patch)
tree56f1965fe6497e3c6957132ea875d8558e10add2
parent226c78e59b19be43d85f5ab8b42063041b80ee81 (diff)
downloadtdebase-96f718bb7eeb9e2047223efc7b30cbc0ec8b0ded.tar.gz
tdebase-96f718bb7eeb9e2047223efc7b30cbc0ec8b0ded.zip
Fix accidental reversion of commit 0702f6
-rw-r--r--tdeioslave/media/mediamanager/tdehardwarebackend.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index 08bde4d9e..0252fb114 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -152,7 +152,13 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
&& !(sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio))
&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
) {
- //
+ //
+ }
+ /* We also don't display devices that underlie other devices;
+ /* e.g. the raw partition of a device mapper volume
+ */
+ else if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice)) {
+ //
}
else {
// Create medium