Merge remote-tracking branch 'origin/master'

2 files changed, 7 insertions, 5 deletions

diff --git a/src-qt5/core-utils/lumina-search/MainUI.cpp b/src-qt5/core-utils/lumina-search/MainUI.cpp
index 99b04b2b..93ee7411 100644
--- a/src-qt5/core-utils/lumina-search/MainUI.cpp
+++ b/src-qt5/core-utils/lumina-search/MainUI.cpp
@@ -169,8 +169,8 @@ void MainUI::foundSearchItem(QString path){
   //Now setup the visuals
   if(path.simplified().endsWith(".desktop")){
     bool ok = false;
-    XDGDesktop desk = LXDG::loadDesktopFile(path,ok);
-    if( !ok  || !LXDG::checkValidity(desk) ){delete it; return; } //invalid file
+    XDGDesktop desk(path);
+    if( !desk.isValid() ){delete it; return; } //invalid file
     it->setText(desk.name);
     it->setIcon( LXDG::findIcon(desk.icon, "application-x-desktop") );
   }else{
diff --git a/src-qt5/core-utils/lumina-search/Worker.cpp b/src-qt5/core-utils/lumina-search/Worker.cpp
index b414a72f..025bcc1e 100644
--- a/src-qt5/core-utils/lumina-search/Worker.cpp
+++ b/src-qt5/core-utils/lumina-search/Worker.cpp
@@ -6,11 +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();
+  QList<XDGDesktop*> apps = LXDG::systemDesktopFiles();
   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;
+    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(){
@@ -108,4 +110,4 @@ void Worker::beginsearch(){
   }
   emit SearchUpdate( tr("Search Finished") );
   emit SearchDone();
-}
\ No newline at end of file
+}