diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-08-08 14:58:04 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-08-08 14:58:04 -0500 |
| commit | a669fb0c5937ac2cc55e564cb6607c221dc61efd (patch) | |
| tree | 4b7abb979ffbd4bdfcbc558f6ed6f867c9420ce3 | |
| parent | 4bd0fd248f15db483f28083899f8bdde5e79ca29 (diff) | |
| download | tdebase-a669fb0c5937ac2cc55e564cb6607c221dc61efd.tar.gz tdebase-a669fb0c5937ac2cc55e564cb6607c221dc61efd.zip | |
Fix unintended changes from prior commit
| -rw-r--r-- | tdeioslave/media/mediamanager/tdehardwarebackend.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp index 0753d2ff2..369f87c3a 100644 --- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp @@ -91,7 +91,6 @@ TDEBackend::~TDEBackend() } void TDEBackend::AddDeviceHandler(TDEGenericDevice *device) { -printf("[RAJA DEBUG 100.0] In TDEBackend::AddDeviceHandler for '%s'\n\r", device->uniqueID().ascii()); fflush(stdout); if (device->type() == TDEGenericDeviceType::Disk) { TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device); AddDevice(sdevice); @@ -99,7 +98,6 @@ printf("[RAJA DEBUG 100.0] In TDEBackend::AddDeviceHandler for '%s'\n\r", device } void TDEBackend::RemoveDeviceHandler(TDEGenericDevice *device) { -printf("[RAJA DEBUG 100.0] In TDEBackend::RemoveDeviceHandler for '%s'\n\r", device->uniqueID().ascii()); fflush(stdout); if (device->type() == TDEGenericDeviceType::Disk) { TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device); RemoveDevice(sdevice); @@ -107,7 +105,6 @@ printf("[RAJA DEBUG 100.0] In TDEBackend::RemoveDeviceHandler for '%s'\n\r", dev } void TDEBackend::ModifyDeviceHandler(TDEGenericDevice *device) { -printf("[RAJA DEBUG 100.0] In TDEBackend::ModifyDeviceHandler for '%s'\n\r", device->uniqueID().ascii()); fflush(stdout); if (device->type() == TDEGenericDeviceType::Disk) { TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device); ModifyDevice(sdevice); @@ -1201,12 +1198,10 @@ TQString TDEBackend::unmount(const TQString &_udi) // There is a possibility that the storage device was unceremoniously removed from the system immediately after it was unmounted // There is no reliable way to know if this happened either! // For now, see if the device node still exists -// RAJA FIXME -// Is this causing/masking the Eject/Unmount race condition? -// TQFileInfo checkDN(node); -// if (!checkDN.exists()) { -// m_mediaList.removeMedium(uid, true); -// } + TQFileInfo checkDN(node); + if (!checkDN.exists()) { + m_mediaList.removeMedium(uid, true); + } return TQString(); } |