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

Don't register the Display shutdown hook in the static initializer. Register it at create() and remove it at destroy(). This avoids unnecessary conflicts when only using AWT stuff

This commit is contained in:
Elias Naur 2006-10-26 19:41:15 +00:00
parent fe1693a3c9
commit 0a17002082
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/java/org/lwjgl/opengl/Display.java
View File

@ -59,6 +59,11 @@ import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
public final class Display {
private static final Thread shutdown_hook = new Thread() {
public void run() {
reset();
}
};
/** The display implementor */
private static final DisplayImplementation display_impl;
@ -105,16 +110,6 @@ public final class Display {
try {
current_mode = initial_mode = display_impl.init();
LWJGLUtil.log("Initial mode: " + initial_mode);
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
Runtime.getRuntime().addShutdownHook(new Thread() {
public void run() {
reset();
}
});
return null;
}
});
} catch (LWJGLException e) {
throw new RuntimeException(e);
}
@ -589,7 +584,10 @@ public final class Display {
}
processMessages();
pollDevices();
}
static void pollDevices() {
// Poll the input devices while we're here
if (Mouse.isCreated()) {
Mouse.poll();
@ -677,6 +675,12 @@ public final class Display {
throw new IllegalStateException("Only one LWJGL context may be instantiated at any one time.");
if (pixel_format == null)
throw new NullPointerException("pixel_format cannot be null");
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
Runtime.getRuntime().addShutdownHook(shutdown_hook);
return null;
}
});
if (fullscreen)
switchDisplayMode();
try {
@ -777,6 +781,12 @@ public final class Display {
x = y = -1;
cached_icons = null;
reset();
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
Runtime.getRuntime().removeShutdownHook(shutdown_hook);
return null;
}
});
}
private static void destroyPeerInfo() {