Quick adjustment for the finding of icons.

Only use the fallback icon *after* the more expansive routine also fails.
lumina-desktop · Nov 21, 2017 · a881c51 · a881c51
1 parent 7de410f
commit a881c51
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp
@@ -853,7 +853,7 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){
   QIcon tmp;
   if(!iconName.contains("libreoffice")){ //libreoffice is stupid - their svg icons are un-renderable with Qt
     tmp = QIcon::fromTheme(iconName);
-    if(tmp.isNull()){ tmp = QIcon::fromTheme(fallback); }
+    //if(tmp.isNull()){ tmp = QIcon::fromTheme(fallback); }
   }
   if(!tmp.isNull()){ return tmp; } //found one in the theme
 

diff --git a/src-qt5/core/lumina-desktop/panel-plugins/applauncher/AppLaunchButton.cpp b/src-qt5/core/lumina-desktop/panel-plugins/applauncher/AppLaunchButton.cpp
@@ -16,7 +16,7 @@ AppLaunchButtonPlugin::AppLaunchButtonPlugin(QWidget *parent, QString id, bool h
     button->setAutoRaise(true);
     button->setToolButtonStyle(Qt::ToolButtonIconOnly);
     appfile = id.section("---",0,0).section("::",1,1);
-    if(!QFile::exists(appfile) && appfile.endsWith(".desktop")){ 
+    if(!QFile::exists(appfile) && appfile.endsWith(".desktop")){
       //might be a relative path - try to find the file
       appfile = LUtils::AppToAbsolute(appfile.section("/",-1) );
     }