From 02360f89ddd66d46844b03bbd3e29aababf478d0 Mon Sep 17 00:00:00 2001
From: Bill Kuker <bkuker@billkuker.com>
Date: Thu, 27 Sep 2012 14:55:24 +0000
Subject: [PATCH] GL Init must happen after OSX init, or else the application
 name does not take effect. Ugh.

---
 core/src/net/sf/openrocket/startup/Startup.java  | 3 ---
 core/src/net/sf/openrocket/startup/Startup2.java | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/net/sf/openrocket/startup/Startup.java b/core/src/net/sf/openrocket/startup/Startup.java
index dd3f36975..31f83184a 100644
--- a/core/src/net/sf/openrocket/startup/Startup.java
+++ b/core/src/net/sf/openrocket/startup/Startup.java
@@ -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();
 
diff --git a/core/src/net/sf/openrocket/startup/Startup2.java b/core/src/net/sf/openrocket/startup/Startup2.java
index 82bc0d3c1..1caa62626 100644
--- a/core/src/net/sf/openrocket/startup/Startup2.java
+++ b/core/src/net/sf/openrocket/startup/Startup2.java
@@ -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() {