michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AppletLoader - tweak image loading to fix cases where it doesn't work

This commit is contained in:
kappa1 2011-02-02 22:29:18 +00:00
parent f8fbb34f22
commit 9e26e3ef59
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/org/lwjgl/util/applet/AppletLoader.java
View File

@ -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);