Skip to content

Fixes #1319 - LWJGL2: start(true) should not freeze when context could not be initialized #1320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MeFisto94 merged 1 commit into from
Apr 4, 2020
Merged

Fixes #1319 - LWJGL2: start(true) should not freeze when context could not be initialized #1320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglAbstractDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,15 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna
/**
* Does LWJGL display initialization in the OpenGL thread
*/
protected boolean initInThread(){
protected boolean initInThread() {
try {
if (!JmeSystem.isLowPermissions()){
if (!JmeSystem.isLowPermissions()) {
// Enable uncaught exception handler only for current thread
Thread.currentThread().setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override
public void uncaughtException(Thread thread, Throwable thrown) {
listener.handleError("Uncaught exception thrown in "+thread.toString(), thrown);
if (needClose.get()){
if (needClose.get()) {
// listener.handleError() has requested the
// context to close. Satisfy request.
deinitInThread();
Expand All @@ -119,23 +119,25 @@ public void uncaughtException(Thread thread, Throwable thrown) {

created.set(true);
super.internalCreate();
} catch (Exception ex){
} catch (Exception ex) {
try {
if (Display.isCreated())
if (Display.isCreated()) {
Display.destroy();
}
} catch (Exception ex2){
logger.log(Level.WARNING, null, ex2);
}

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
}

listener.initialize();
return true;
}

protected boolean checkGLError(){
protected boolean checkGLError() {
try {
Util.checkGLError();
} catch (OpenGLException ex){
Expand Down