hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GL Init must happen after OSX init, or else the application name does not take effect. Ugh.

Browse Source
This commit is contained in:
Bill Kuker 2012-09-27 14:55:24 +00:00
parent 4073246388
commit 02360f89dd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/net/sf/openrocket/startup/Startup.java
View File

@ -4,7 +4,6 @@ import java.io.PrintStream;
import java.util.Locale;
import java.util.prefs.Preferences;
import net.sf.openrocket.gui.figure3d.OpenGLUtils;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.DebugTranslator;
import net.sf.openrocket.l10n.L10N;
@ -52,8 +51,6 @@ public class Startup {
Application.setPreferences( new SwingPreferences() );
OpenGLUtils.earlyInitialize();
// Setup the translations
initializeL10n();

3
core/src/net/sf/openrocket/startup/Startup2.java
View File

@ -16,6 +16,7 @@ import net.sf.openrocket.communication.UpdateInfoRetriever;
import net.sf.openrocket.database.ComponentPresetDatabase;
import net.sf.openrocket.database.Databases;
import net.sf.openrocket.gui.dialogs.UpdateInfoDialog;
import net.sf.openrocket.gui.figure3d.OpenGLUtils;
import net.sf.openrocket.gui.main.BasicFrame;
import net.sf.openrocket.gui.main.MRUDesignFile;
import net.sf.openrocket.gui.main.Splash;
@ -60,6 +61,8 @@ public class Startup2 {
OSXStartup.setupOSX();
}
OpenGLUtils.earlyInitialize();
// Run the actual startup method in the EDT since it can use progress dialogs etc.
log.info("Moving startup to EDT");
SwingUtilities.invokeAndWait(new Runnable() {