From 9e26e3ef59ad5c1ad7e0f500f2dae967423a6ce9 Mon Sep 17 00:00:00 2001 From: kappa1 Date: Wed, 2 Feb 2011 22:29:18 +0000 Subject: [PATCH] AppletLoader - tweak image loading to fix cases where it doesn't work --- src/java/org/lwjgl/util/applet/AppletLoader.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/java/org/lwjgl/util/applet/AppletLoader.java b/src/java/org/lwjgl/util/applet/AppletLoader.java index d4daf503..5d3fc014 100644 --- a/src/java/org/lwjgl/util/applet/AppletLoader.java +++ b/src/java/org/lwjgl/util/applet/AppletLoader.java @@ -774,7 +774,7 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { // set lwjgl properties setLWJGLProperties(); - // switch to LWJGL Applet + // make applet switch on EDT as an AWT/Swing permission dialog could be called EventQueue.invokeAndWait(new Runnable() { public void run() { try { @@ -1556,11 +1556,11 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { */ protected Image getImage(String s) { try { - URL url = Thread.currentThread().getContextClassLoader().getResource("/"+s); - - // if image not found in jar, look outside it + URL url = url = new URL(getCodeBase(), s); + + // if image failed to load, try another method if (url == null) { - url = new URL(getCodeBase(), s); + Thread.currentThread().getContextClassLoader().getResource(s); } Image image = super.getImage(url);