installer: Proper broken folder fix; Install directory fix

diff --git a/installer/Installer.epj b/installer/Installer.epj
index 624bc84..332bc20 100644 (file)
--- a/installer/Installer.epj
+++ b/installer/Installer.epj
@@ -121,9 +121,7 @@
                "Folder" : "mimetypes",
                "Files" : [
                   "../ecere/res/mimeTypes/file.png",
-                  "../ecere/res/mimeTypes/brokenFile.png",
-                  "../ecere/res/places/brokenFolder.png",
-                  "../ecere/res/places/folder.png"
+                  "../ecere/res/mimeTypes/brokenFile.png"
                ]
             },
             {
@@ -133,7 +131,8 @@
                   "../ecere/res/places/folder.png",
                   "../ecere/res/places/folderRemote.png",
                   "../ecere/res/places/networkServer.png",
-                  "../ecere/res/places/networkWorkgroup.png"
+                  "../ecere/res/places/networkWorkgroup.png",
+                  "../ecere/res/places/brokenFolder.png"
                ]
             },
             {

diff --git a/installer/src/installer.ec b/installer/src/installer.ec
index 1a83d2e..1dc1b12 100644 (file)
--- a/installer/src/installer.ec
+++ b/installer/src/installer.ec
@@ -856,11 +856,12 @@ class Installer : Window
          if(x86)
          {
             strcpy(installDir32, programFilesDir);
+            PathCat(installDir32, "Ecere SDK");
             osIS64bit = true;
 
             *x86 = 0;
-            PathCat(installDir, "Ecere SDK");
             strcpy(installDir, programFilesDir);
+            PathCat(installDir, "Ecere SDK");
          }
          else
          {