sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1320 from MeFisto94/fix-lwjgl3-double-stop

Browse Source 
Fixes #1319 - LWJGL2: start(true) should not freeze when context could not be initialized
This commit is contained in:
MeFisto94 2020-04-04 20:15:52 +02:00 committed by GitHub
commit efc1962092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglAbstractDisplay.java
View File

@ -93,15 +93,15 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna
/** /**
* Does LWJGL display initialization in the OpenGL thread * Does LWJGL display initialization in the OpenGL thread
*/ */
protected boolean initInThread(){ protected boolean initInThread() {
try { try {
if (!JmeSystem.isLowPermissions()){ if (!JmeSystem.isLowPermissions()) {
// Enable uncaught exception handler only for current thread // Enable uncaught exception handler only for current thread
Thread.currentThread().setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { Thread.currentThread().setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override @Override
public void uncaughtException(Thread thread, Throwable thrown) { public void uncaughtException(Thread thread, Throwable thrown) {
listener.handleError("Uncaught exception thrown in "+thread.toString(), thrown); listener.handleError("Uncaught exception thrown in "+thread.toString(), thrown);
if (needClose.get()){ if (needClose.get()) {
// listener.handleError() has requested the // listener.handleError() has requested the
// context to close. Satisfy request. // context to close. Satisfy request.
deinitInThread(); deinitInThread();
@ -119,15 +119,17 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna
created.set(true); created.set(true);
super.internalCreate(); super.internalCreate();
} catch (Exception ex){ } catch (Exception ex) {
try { try {
if (Display.isCreated()) if (Display.isCreated()) {
Display.destroy(); Display.destroy();
}
} catch (Exception ex2){ } catch (Exception ex2){
logger.log(Level.WARNING, null, ex2); logger.log(Level.WARNING, null, ex2);
} }
listener.handleError("Failed to create display", ex); listener.handleError("Failed to create display", ex);
createdLock.notifyAll(); // Release the lock, so start(true) doesn't deadlock.
return false; // if we failed to create display, do not continue return false; // if we failed to create display, do not continue
} }
@ -135,7 +137,7 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna
return true; return true;
} }
protected boolean checkGLError(){ protected boolean checkGLError() {
try { try {
Util.checkGLError(); Util.checkGLError();
} catch (OpenGLException ex){ } catch (OpenGLException ex){