Merge remote-tracking branch 'origin/master'

1 files changed, 7 insertions, 3 deletions

diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp
index 0e33f254..96f77ff9 100644
--- a/src-qt5/core/libLumina/LuminaXDG.cpp
+++ b/src-qt5/core/libLumina/LuminaXDG.cpp
@@ -906,13 +906,13 @@ QStringList LXDG::systemApplicationDirs(){
   return sysapps;
 }*/
 
-QList<XDGDesktop*> LXDG::systemDesktopFiles(bool showAll, bool showHidden){
+/*QList<XDGDesktop*> LXDG::systemDesktopFiles(bool showAll, bool showHidden){
   //If this is going to be used regularly, it is better to use a custom instance of an XDGDesktopList() which self-updates instead.
   //  Since this function will need to re-read the entire system app registry every time.
   XDGDesktopList sysapps;
   sysapps.updateList();
   return sysapps.apps(showAll, showHidden); 
-}
+}*/
 
 QHash<QString,QList<XDGDesktop*> > LXDG::sortDesktopCats(QList<XDGDesktop*> apps){
   //Sort the list of applications into their different categories (main categories only)
@@ -1499,7 +1499,11 @@ QStringList LXDG::loadMimeFileGlobs2(){
         }
 	file.close();
       }
-    }    
+      if(i==dirs.length()-1 && mimeglobs.isEmpty()){
+        //Could not find the mimetype database on the system - use the fallback file distributed with Lumina
+        dirs << LOS::LuminaShare();
+      }
+    }//end loop over dirs
   }
   return mimeglobs;
 }