diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-15 03:03:58 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-15 03:03:58 -0500 |
| commit | 41c013e06c430febb6a5353286573c968ca01440 (patch) | |
| tree | 0fee1f29c1dc2ac11009aeef169cf9376303d22a /tdeioslave/media/mounthelper | |
| parent | 9e4aad6b3bc3c1b4781a3c1cef6968640d4f6e67 (diff) | |
| download | tdebase-41c013e06c430febb6a5353286573c968ca01440.tar.gz tdebase-41c013e06c430febb6a5353286573c968ca01440.zip | |
Fix a number of issues with the media tdeioslave
This relates to Bug 1450
Add media disk space overlay and enable by default
Diffstat (limited to 'tdeioslave/media/mounthelper')
| -rw-r--r-- | tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index 230d69715..4dbb427f5 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -149,8 +149,9 @@ MountHelper::MountHelper() : TDEApplication() if (medium.isMounted()) { DCOPReply reply = mediamanager.call( "unmount", medium.id()); - if (reply.isValid()) - reply.get(m_errorStr); + if (reply.isValid()) { + reply.get(m_errorStr); + } } /* If this is a decrypted volume and there is no error yet @@ -158,14 +159,17 @@ MountHelper::MountHelper() : TDEApplication() if (m_errorStr.isNull() && medium.isEncrypted() && !medium.clearDeviceUdi().isNull()) { DCOPReply reply = mediamanager.call( "undecrypt", medium.id()); - if (reply.isValid()) + if (reply.isValid()) { reply.get(m_errorStr); + } } - if (m_errorStr.isNull()) + if (m_errorStr.isNull()) { invokeEject(device, true); - else + } + else { error(); + } } else { |