Ticket #9169: autoplay-hdd.diff

mythtv/libs/libmyth/mythhdd.cpp

@@ -41 +41 @@
         return setStatus(MEDIASTAT_MOUNTED);
     }
 
+    // Has device been removed?
+    if (!isDeviceOpen())
+    {
+        if (!openDevice())
+            return setStatus(MEDIASTAT_UNPLUGGED);
+        closeDevice();
+    }
+
     // device is not mounted
-    if (m_Status == MEDIASTAT_UNPLUGGED)
+    switch (m_Status)
     {
+    case MEDIASTAT_UNPLUGGED:
         // a removable device was just plugged in try to mount it.
         mount();
         if (isMounted())
@@ -51 +60 @@
             m_Status = MEDIASTAT_NOTMOUNTED;
             return setStatus(MEDIASTAT_MOUNTED);
         }
-        else
-            return setStatus(MEDIASTAT_NOTMOUNTED);
-    }
-    else if (m_Status == MEDIASTAT_MOUNTED)
-    {
+        return setStatus(MEDIASTAT_NOTMOUNTED);
+    case MEDIASTAT_MOUNTED:
         // device was mounted and someone unmounted it.
-        return m_Status = setStatus(MEDIASTAT_NOTMOUNTED);
-    }
-    else
-    {
+        return setStatus(MEDIASTAT_NOTMOUNTED);
+    default:
         // leave device state as is
         return m_Status;
     }