|
@@ -1,5 +1,5 @@
|
|
/*
|
|
/*
|
|
- * Copyright (c) 2009-2020 jMonkeyEngine
|
|
|
|
|
|
+ * Copyright (c) 2009-2021 jMonkeyEngine
|
|
* All rights reserved.
|
|
* All rights reserved.
|
|
*
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* Redistribution and use in source and binary forms, with or without
|
|
@@ -57,6 +57,8 @@ import java.util.logging.Level;
|
|
import java.util.logging.Logger;
|
|
import java.util.logging.Logger;
|
|
import org.lwjgl.Version;
|
|
import org.lwjgl.Version;
|
|
import org.lwjgl.glfw.*;
|
|
import org.lwjgl.glfw.*;
|
|
|
|
+import org.lwjgl.system.Platform;
|
|
|
|
+
|
|
import static org.lwjgl.glfw.GLFW.*;
|
|
import static org.lwjgl.glfw.GLFW.*;
|
|
import static org.lwjgl.opengl.GL11.GL_FALSE;
|
|
import static org.lwjgl.opengl.GL11.GL_FALSE;
|
|
import static org.lwjgl.system.MemoryUtil.NULL;
|
|
import static org.lwjgl.system.MemoryUtil.NULL;
|
|
@@ -477,10 +479,21 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- // NOTE: this is required for Mac OS X!
|
|
|
|
- mainThread = Thread.currentThread();
|
|
|
|
- mainThread.setName("jME3 Main");
|
|
|
|
- run();
|
|
|
|
|
|
+ if (Platform.get() == Platform.MACOSX) {
|
|
|
|
+ // NOTE: this is required for Mac OS X!
|
|
|
|
+ mainThread = Thread.currentThread();
|
|
|
|
+ mainThread.setName("jME3 Main");
|
|
|
|
+ if (waitFor) {
|
|
|
|
+ LOGGER.warning("create(true) is not supported for macOS!");
|
|
|
|
+ }
|
|
|
|
+ run();
|
|
|
|
+ } else {
|
|
|
|
+ new Thread(this, "jME3 Main").start();
|
|
|
|
+ if (waitFor) {
|
|
|
|
+ waitFor(true);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|