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

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

View File

@ -121,13 +121,15 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna
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
} }