Ticket #1570: cancel_show_devices.diff

mythgallery/mythgallery/iconview.cpp

@@ -1024 +1024 @@
 
 void IconView::actionMainMenu()
 {
+    if (m_showDevices)
+    {
+        QDir d(m_currDir);
+        if (!d.exists())
+            m_currDir = m_galleryDir;
+
+        loadDirectory(m_currDir);
+        m_showDevices = false;
+    }
+
     clearMenu(m_submenuType);
     m_submenuType->Reset();
 
@@ -1301 +1311 @@
         m_currDevice->disconnect(this);
         mon->Unlock(m_currDevice);
     }
+    else
+        m_currDir = m_galleryDir;
 #endif
 
     m_currDevice = NULL;