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

Display: Don't add the shutdown hook twice when a previous create() call has failed

This commit is contained in:
Elias Naur 2006-11-19 11:43:00 +00:00
parent a7e564a06a
commit 7ca70d8c5e
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -657,6 +657,24 @@ public final class Display {
create(pixel_format, null);
}
private static void removeShutdownHook() {
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
Runtime.getRuntime().removeShutdownHook(shutdown_hook);
return null;
}
});
}
private static void registerShutdownHook() {
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
Runtime.getRuntime().addShutdownHook(shutdown_hook);
return null;
}
});
}
/**
* Create the OpenGL context with the given minimum parameters. If isFullscreen() is true or if windowed
* context are not supported on the platform, the display mode will be switched to the mode returned by
@ -675,12 +693,8 @@ 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;
}
});
removeShutdownHook();
registerShutdownHook();
if (fullscreen)
switchDisplayMode();
try {
@ -781,12 +795,7 @@ 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;
}
});
removeShutdownHook();
}
private static void destroyPeerInfo() {