From d16efbcea9cf5065ee6afe000ca5366d508e9f25 Mon Sep 17 00:00:00 2001 From: Brian Matzon Date: Tue, 11 Jan 2011 20:54:26 +0000 Subject: [PATCH] fixed issue with empty java_arguments by switching to lwjgl_arguments param name instead --- .../org/lwjgl/util/applet/AppletLoader.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/java/org/lwjgl/util/applet/AppletLoader.java b/src/java/org/lwjgl/util/applet/AppletLoader.java index e9027067..137b8c4a 100644 --- a/src/java/org/lwjgl/util/applet/AppletLoader.java +++ b/src/java/org/lwjgl/util/applet/AppletLoader.java @@ -784,17 +784,21 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { * properties accordingly, before the launch. */ protected void setLWJGLProperties() { - String javaArguments = getParameter("java_arguments"); - if(javaArguments != null && javaArguments.length() > 0) { - int start = javaArguments.indexOf("-Dorg.lwjgl"); + String lwjglArguments = getParameter("lwjgl_arguments"); + + if(lwjglArguments != null && lwjglArguments.length() > 0) { + int start = lwjglArguments.indexOf("-Dorg.lwjgl"); while(start != -1) { - int end = javaArguments.indexOf(" ", start); + int end = lwjglArguments.indexOf(" ", start); if(end == -1) { - end = javaArguments.length(); + end = lwjglArguments.length(); } - String[] keyValue = javaArguments.substring(start+2, end).split("="); + String[] keyValue = lwjglArguments.substring(start+2, end).split("="); System.setProperty(keyValue[0], keyValue[1]); - start = javaArguments.indexOf("-Dorg.lwjgl", end); + if(debugMode) { + System.out.println("Setting property " + keyValue[0] + " to " + keyValue[1]); + } + start = lwjglArguments.indexOf("-Dorg.lwjgl", end); } } }