Ticket #3837: mythgallery-mount-fail.patch

configure

@@ -18 +18 @@
 news="yes"
 phone="yes"
 browser="yes"
+books="yes"
 controls="yes"
 flix="yes"
 archive="yes"
@@ -72 +73 @@
 MythBrowser related options:
   --enable-mythbrowser     build the mythbrowser plugin [$browser]
 
+MythBooks related options:
+  --enable-mythbooks       build the mythbooks plugin [$books]
+
 MythControls related options:
   --enable-mythcontrols    build the mythcontrols plugin [$controls]
 
@@ -200 +204 @@
   ;;
   --disable-mythbrowser) browser="no"
   ;;
+  --enable-mythbooks) books="yes"
+  ;;
+  --disable-mythbooks) books="no"
+  ;;
   --enable-mythzoneminder) zoneminder="yes"
   ;;
   --disable-mythzoneminder) zoneminder="no"
@@ -259 +267 @@
                  news="yes";
                  phone="yes";
                  browser="yes";
+                 books="yes";
                  zoneminder="yes";
                  controls="yes";
                  flix="yes";
@@ -283 +292 @@
                  news="no";
                  phone="no";
                  browser="no";
+                 books="no";
                  zoneminder="no";
                  controls="no";
                  flix="no";
@@ -607 +617 @@
   echo "        MythBrowser    plugin will not be built"
 fi
 
+if test "$books" = "yes" ; then
+  echo "        MythBooks      plugin will be built"
+  echo "SUBDIRS += mythbooks" >> ./config.pro
+else
+  echo "        MythBooks      plugin will not be built"
+fi
+
 if test "$controls" = "yes" ; then
   echo "        MythControls   plugin will be built"
   echo "SUBDIRS += mythcontrols" >> ./config.pro

settings.pro

@@ -37 +37 @@
 
 QMAKE_CFLAGS += $$ARCHFLAGS
 QMAKE_CFLAGS_SHLIB = -DPIC -fPIC
-QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE}
+QMAKE_CFLAGS_RELEASE = -O2 -pipe -fomit-frame-pointer -march=athlon64 -msse3
 QMAKE_CFLAGS += $$ECFLAGS
 
 # figure out defines 

mythgallery/mythgallery/iconview.cpp

@@ -138 +138 @@
     MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
     if (m_currDevice && mon && mon->ValidateAndLock(m_currDevice))
     {
-        if (!m_currDevice->isMounted(true))
-            m_currDevice->mount();
+        bool mounted = m_currDevice->isMounted(true);
+        if (!mounted) mounted = m_currDevice->mount();
 
-        connect(m_currDevice,
+        if(mounted) {
+            connect(m_currDevice,
                 SIGNAL(statusChanged(MediaStatus, MythMediaDevice*)),
                 SLOT(mediaStatusChanged(MediaStatus, MythMediaDevice*)));
 
-        LoadDirectory(m_currDevice->getMountPath(), true);
+            LoadDirectory(m_currDevice->getMountPath(), true);
 
-        mon->Unlock(m_currDevice);
+            mon->Unlock(m_currDevice);
+            return;
+        } else {
+            mon->Unlock(m_currDevice);
+        }
     }
-    else
-    {
-        m_currDevice = NULL;
-        LoadDirectory(m_galleryDir, true);
-    }
+    m_currDevice = NULL;
+    LoadDirectory(m_galleryDir, true);
 #endif // _WIN32
 }