From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 13 Mar 2018 17:14:39 +0000 (+0000)
Subject: wip #819 @1.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=fc37ca508ff045b71b5b44f402046a0e80ce1118;p=cubeextranet.git

wip #819 @1.5
---

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 6742ac039..90769cc3f 100644
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -509,7 +509,6 @@ class commonTools {
 		}
 
 		$icotool->execute();
-		$png2icns->execute();
 
 		rename($tmp . '/ico-16.png', $tmp . '/favicon.png');
 
@@ -541,6 +540,9 @@ class commonTools {
 	}
 
 	public static function pngToIcns($file, $res) {
+		if(!file_exists($file)){
+			return;
+		}
 		$icns = array(128, 256, 512);
 
 		$png2icns = new cubeCommandLine('png2icns');
@@ -550,7 +552,7 @@ class commonTools {
 
 		foreach ($icns as $s) {
 			$r = CubeIT_Files::tempnam() . '.png';
-			$tmp[]=$r;
+			$tmp[] = $r;
 			$it = new cubeImageTools();
 			$it->loadImage($file);
 			$it->resize($s, $s, 'crop', true, 'C', 'M', 'transparent');
@@ -561,7 +563,6 @@ class commonTools {
 		}
 
 		$png2icns->execute();
-
 		foreach ($tmp as $item) {
 			unlink($tmp);
 		}
diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
index 5e40df2bc..65327c563 100644
--- a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
@@ -61,6 +61,7 @@ class wsPackagerWinEXEHTML extends wsPackager {
 		$cl->execute();
 
 		$this->compileShortcut();
+
 	}
 
 	function compileShortcut() {