[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/KDE/4.8] solid/solid/backends/udisks: prevent calling eject twice, resulting in the tray be
From:       Lukas Tinkl <lukas () kde ! org>
Date:       2012-07-13 12:25:33
Message-ID: 20120713122533.866E0A6094 () git ! kde ! org
[Download RAW message or body]

Git commit 9ac57f1b582ca1fdf889016c7bc2a3628ef7d80e by Lukas Tinkl.
Committed on 13/07/2012 at 14:25.
Pushed by lukas into branch 'KDE/4.8'.

prevent calling eject twice, resulting in the tray being retracted on
some PCs

BUG: 296657

M  +3    -1    solid/solid/backends/udisks/udisksstorageaccess.cpp

http://commits.kde.org/kdelibs/9ac57f1b582ca1fdf889016c7bc2a3628ef7d80e

diff --git a/solid/solid/backends/udisks/udisksstorageaccess.cpp \
b/solid/solid/backends/udisks/udisksstorageaccess.cpp index a5f013c..71a4d43 100644
--- a/solid/solid/backends/udisks/udisksstorageaccess.cpp
+++ b/solid/solid/backends/udisks/udisksstorageaccess.cpp
@@ -172,7 +172,9 @@ void UDisksStorageAccess::slotDBusReply( const QDBusMessage & \
reply )  m_teardownInProgress = false;
             m_device->broadcastActionDone("teardown");
 
-            if (m_device->prop("DriveIsMediaEjectable").toBool() && \
!m_device->prop("DeviceIsOpticalDisc").toBool()) // optical drives have their Eject \
method +            if (m_device->prop("DriveIsMediaEjectable").toBool() &&
+                    m_device->prop("DeviceIsMediaAvailable").toBool() &&
+                    !m_device->prop("DeviceIsOpticalDisc").toBool()) // optical \
drives have their Eject method  {
                 QString devnode = m_device->prop("DeviceFile").toString();
 


[prev in list] [next in list] [prev in thread] [next in thread]