Changeset 618 for AE/installer2

Timestamp:

Jan 15, 2013, 2:50:36 AM (12 years ago)

Author:

alloc

Message:

AEI2:

• Added check for Oni's exe before trying to launch it

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• gui/MainWin.java (modified) (3 diffs)

AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.79
+appversion=0.80
 
 invalidPath.title=Wrong directory

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

@@ -434 +434 @@
                         }
                 }
-                
+
                 if (instReady) {
                         System.out.println("Install mods: " + mods.toString());
@@ -451 +451 @@
                 return false;
         }
-        
+
         @SuppressWarnings("unused")
         private void installDone() {
@@ -528 +528 @@
         private Vector<String> getBasicOniLaunchParams() {
                 Vector<String> params = new Vector<String>();
+                File exe = null;
                 switch (Settings.getPlatform()) {
                         case WIN:
-                                params.add(new File(Paths.getEditionBasePath(), "Oni.exe")
-                                                .getPath());
+                                exe = new File(Paths.getEditionBasePath(), "Oni.exe");
+                                if (exe.exists())
+                                        params.add(exe.getPath());
                                 break;
                         case MACOS:
-                                params.add(new File(Paths.getEditionBasePath(),
-                                                "Oni.app/Contents/MacOS/Oni").getPath());
+                                exe = new File(Paths.getEditionBasePath(),
+                                                "Oni.app/Contents/MacOS/Oni");
+                                if (exe.exists())
+                                        params.add(exe.getPath());
                                 break;
                         case LINUX:
                                 String wine = Settings.getWinePath();
-                                if (wine != null) {
-                                        params.add(wine);
-                                        params.add(new File(Paths.getEditionBasePath(), "Oni.exe")
-                                                        .getPath());
+                                exe = new File(Paths.getEditionBasePath(), "Oni.exe");
+                                if (exe.exists()) {
+                                        if (wine != null) {
+                                                params.add(wine);
+                                                params.add(exe.getPath());
+                                        }
                                 }
                                 break;