Index: java/installer2/src/net/oni2/aeinstaller/backend/oni/OniLauncher.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/backend/oni/OniLauncher.java	(revision 1011)
+++ java/installer2/src/net/oni2/aeinstaller/backend/oni/OniLauncher.java	(revision 1012)
@@ -3,8 +3,13 @@
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.Vector;
 
+import org.apache.commons.io.FileUtils;
+
+import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
 import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.platformtools.PlatformInformation;
+import net.oni2.platformtools.PlatformInformation.Platform;
 import net.oni2.platformtools.applicationinvoker.ApplicationInvoker;
 import net.oni2.platformtools.applicationinvoker.EExeType;
@@ -43,4 +48,25 @@
 		}
 	}
+	
+	private static Vector<String> getLaunchArgs () {
+		Vector<String> res = new Vector<String>();
+		if (PlatformInformation.getPlatform() == Platform.MACOS) {
+			File launchArgs = CaseInsensitiveFile.getCaseInsensitiveFile(Paths.getEditionBasePath(), "launch_args.txt");
+			if (launchArgs.exists()) {
+				try {
+					String[] argsStrings = FileUtils.readFileToString(launchArgs).split(" ");
+					for (int i = 0; i < argsStrings.length; i++) {
+						argsStrings [i] = argsStrings [i].trim();
+						if (argsStrings [i].length() > 0) {
+							res.add(argsStrings [i]);
+						}
+					}
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return res;
+	}
 
 	/**
@@ -55,8 +81,10 @@
 			ERuntimeNotInstalledException {
 		File exe = getOniExe();
-		Vector<String> params = new Vector<String>();
+		Vector<String> params = getLaunchArgs();
 		params.add("-debugfiles");
 		if (windowed)
 			params.add("-noswitch");
+		else
+			params.remove("-noswitch");
 		ApplicationInvoker.execute(getOniExeType(), Paths.getEditionBasePath(),
 				exe, params, true);