From 0e493ed5bc811c517bc28760fc00f0ce1ed9393a Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Thu, 29 Mar 2012 02:53:37 +0000 Subject: [PATCH] Correct startup order. Since parsing the body tube preset library uses BodyTube and therefore Material and ExternalComponent which holds on to static copies of the translator, it must be done after localization is initialized. --- core/src/net/sf/openrocket/startup/Startup.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/startup/Startup.java b/core/src/net/sf/openrocket/startup/Startup.java index 95b03c528..3f5f176f6 100644 --- a/core/src/net/sf/openrocket/startup/Startup.java +++ b/core/src/net/sf/openrocket/startup/Startup.java @@ -53,10 +53,11 @@ public class Startup { Application.setPreferences( new SwingPreferences() ); - Application.setDaos( new DaosImpl() ); - // Setup the translations initializeL10n(); + + // Must be done after localization is initialized + Application.setDaos( new DaosImpl() ); // Continue startup in Startup2 class (where Application is already set up) Startup2.runMain(args);