From 8baf9e6676ec901455ea2574d989fa04423b7343 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Fri, 26 Apr 2013 21:28:21 -0500 Subject: [PATCH] Load the components in the foreground thread so they are completely loaded before trying to read an ork file from the command line. --- core/src/net/sf/openrocket/startup/ApplicationStartup.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/net/sf/openrocket/startup/ApplicationStartup.java b/core/src/net/sf/openrocket/startup/ApplicationStartup.java index 31b6b9acb..bafd76d87 100644 --- a/core/src/net/sf/openrocket/startup/ApplicationStartup.java +++ b/core/src/net/sf/openrocket/startup/ApplicationStartup.java @@ -20,8 +20,8 @@ import net.sf.openrocket.gui.main.BasicFrame; import net.sf.openrocket.gui.main.MRUDesignFile; import net.sf.openrocket.gui.main.Splash; import net.sf.openrocket.gui.main.SwingExceptionHandler; -import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.BlockingMotorDatabaseProvider; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.util.BuildProperties; @@ -165,14 +165,13 @@ public class ApplicationStartup { } - /** * Start loading preset components in background thread. * * Public for Python bindings. */ public void loadPresetComponents() { - ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase(true) { + ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase(false) { @Override protected void load() { ConcurrentComponentPresetDatabaseLoader presetLoader = new ConcurrentComponentPresetDatabaseLoader(this);