summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-30 18:49:19 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-30 18:49:19 -0500
commit96bfcec9d751b7255163e548b0bbb91b7c7b3332 (patch)
tree43cef27126019f156aaa02a3496689ca93080692
parent6f8808295782992999e2b7e14dcc19a65a2cc5bd (diff)
downloadtdebase-96bfcec9d751b7255163e548b0bbb91b7c7b3332.tar.gz
tdebase-96bfcec9d751b7255163e548b0bbb91b7c7b3332.zip
Fix CD mount popups
-rw-r--r--kioslave/media/mediamanager/tdehardwarebackend.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/kioslave/media/mediamanager/tdehardwarebackend.cpp b/kioslave/media/mediamanager/tdehardwarebackend.cpp
index 1aa0d0ae8..65f287305 100644
--- a/kioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/kioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -284,9 +284,6 @@ void TDEBackend::ModifyDevice(TDEStorageDevice * sdevice)
kdDebug(1219) << "TDEBackend::ModifyDevice for " << sdevice->uniqueID() << endl;
bool allowNotification = false;
- if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable) && (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Inserted))) {
- allowNotification = true;
- }
ResetProperties(sdevice, allowNotification);
}
@@ -297,7 +294,7 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat
if (!m_mediaList.findById(sdevice->uniqueID())) {
// This device is not currently in the device list, so add it and exit
kdDebug(1219) << "TDEBackend::ResetProperties for " << sdevice->uniqueID() << " existing entry in media list was not found" << endl;
- AddDevice(sdevice, allowNotification);
+ AddDevice(sdevice);
return;
}
@@ -381,7 +378,7 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat
// END
- if (sdevice->isDiskOfType(TDEDiskDeviceType::Optical)) {
+ if ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) && (!(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Inserted)))) {
kdDebug(1219) << "TDEBackend::ResetProperties for " << sdevice->uniqueID() << " device was removed from system" << endl;
RemoveDevice(sdevice);
return;