5 files changed, 8 insertions, 9 deletions
diff --git a/src-qt5/core-utils/lumina-search/Worker.cpp b/src-qt5/core-utils/lumina-search/Worker.cpp
index 025bcc1e..0d50d4b8 100644
--- a/src-qt5/core-utils/lumina-search/Worker.cpp
+++ b/src-qt5/core-utils/lumina-search/Worker.cpp
@@ -6,13 +6,13 @@
 
 Worker::Worker(QObject *parent) : QObject(parent){
   //Get the list of all applications and save them in an easily-searchable form
-  QList<XDGDesktop*> apps = LXDG::systemDesktopFiles();
+  XDGDesktopList APPS;
+  APPS.updateList();
+  QList<XDGDesktop*> apps = APPS.apps(false,false);
   for(int i=0; i<apps.length(); i++){
     applist << ":::1:::"+apps[i]->name+":::2:::"+apps[i]->genericName+":::3:::"+apps[i]->comment+":::4:::"+apps[i]->filePath;
   }
   stopsearch = false;
-  //Clean up all the apps structures
-  for(int i=0; i<apps.length(); i++){ apps[i]->deleteLater(); }
 }
 
 Worker::~Worker(){
diff --git a/src-qt5/core-utils/lumina-search/Worker.h b/src-qt5/core-utils/lumina-search/Worker.h
index 87cf1e3b..646fc416 100644
--- a/src-qt5/core-utils/lumina-search/Worker.h
+++ b/src-qt5/core-utils/lumina-search/Worker.h
@@ -30,7 +30,6 @@ private:
 	bool stopsearch;
 	QString sterm;
 	bool sapp;
-
 	bool searchDir(QString);
 
 private slots:
@@ -42,4 +41,4 @@ signals:
 	void SearchDone();
 };
 
-#endif
-\ No newline at end of file
+#endif
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp
index 0e33f254..d89c7f46 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)
diff --git a/src-qt5/core/libLumina/LuminaXDG.h b/src-qt5/core/libLumina/LuminaXDG.h
index f2b1e3e2..dd9d1c67 100644
--- a/src-qt5/core/libLumina/LuminaXDG.h
+++ b/src-qt5/core/libLumina/LuminaXDG.h
@@ -166,7 +166,7 @@ public:
 	static QStringList systemApplicationDirs();
 	//Get a list of all the *.desktop files available on the system
         //static XDGDesktopList* systemAppsList(); //return a pointer to the entire class
-	static QList<XDGDesktop*> systemDesktopFiles(bool showAll = false, bool showHidden = false); //simplification for getting just the files
+	//static QList<XDGDesktop*> systemDesktopFiles(bool showAll = false, bool showHidden = false); //simplification for getting just the files
 	//Sort a list of Desktop files into the proper categories
 	static QHash< QString, QList<XDGDesktop*> > sortDesktopCats(QList<XDGDesktop*> apps);
 	//Return the icon to use for the given category
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp
index bd8e79db..d1d6c7a8 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp
@@ -126,7 +126,7 @@ void AppLauncherPlugin::buttonClicked(){
   QString path = button->whatsThis();
   if(path.isEmpty() || !QFile::exists(path) ){
     //prompt for the user to select an application
-    QList<XDGDesktop*> apps = LXDG::sortDesktopNames( LXDG::systemDesktopFiles() );
+    QList<XDGDesktop*> apps = LSession::handle()->applicationMenu()->currentAppHash()->value("All"); //LXDG::sortDesktopNames( LXDG::systemDesktopFiles() );
     QStringList names;
     for(int i=0; i<apps.length(); i++){ names << apps[i]->name; }
     bool ok = false;