Merge pull request #662 from QuasarApp/task_661

Fix deploy icons
QuasarApp · Sep 20, 2021 · 7350e2e · 7350e2e
2 parents 00780c8 + 3f11a9d
commit 7350e2e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Deploy/Distributions/idistribution.cpp b/Deploy/Distributions/idistribution.cpp
@@ -275,7 +275,6 @@ bool iDistribution::deployIcon(const DistroModule& pkg) {
     auto localData = dataLocation(pkg);
     const DeployConfig *cfg = DeployCore::_config;
 
-    QSet<QString> icons;
     for (const auto& target: pkg.targets()) {
         auto targetObject = cfg->targets().value(target);
 
@@ -292,8 +291,11 @@ bool iDistribution::deployIcon(const DistroModule& pkg) {
         QuasarAppUtils::Params::log(QString("%0: %1").arg(target, icon),
                                     QuasarAppUtils::Debug);
 
-        if (icons.contains(icon))
-            break;
+        if (!targetObject.fEnableRunScript()) {
+            QuasarAppUtils::Params::log(QString("%0: %1 Ignored").arg(target, icon),
+                                        QuasarAppUtils::Debug);
+            continue;
+        }
 
         QFileInfo iconInfo(icon);
         QFileInfo runScript(targetObject.getRunScriptFile());
@@ -307,8 +309,6 @@ bool iDistribution::deployIcon(const DistroModule& pkg) {
 
             return false;
         }
-
-        icons += icon;
     }
 
     return true;