From 3646de2aece10c8b0a2ae0f4fdacb60c0e928636 Mon Sep 17 00:00:00 2001
From: Vhati <tvtronix@yahoo.com>
Date: Fri, 20 Sep 2013 06:24:52 -0400
Subject: [PATCH] Cleaned up some dodgy code when initially prompting for FTL's
 location

---
 pom.xml                                       |  2 +-
 skel_common/readme_changelog.txt              |  3 ++
 .../net/vhati/modmanager/FTLModManager.java   | 41 +++++++++++--------
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 263e557..19f8f95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.vhati.modmanager</groupId>
 	<artifactId>ftl-mod-manager</artifactId>
-	<version>1.3</version>
+	<version>1.4</version>
 	<name>Slipstream Mod Manager</name>
 
 	<!-- Determined by mvn versions:display-plugin-updates -->
diff --git a/skel_common/readme_changelog.txt b/skel_common/readme_changelog.txt
index f7b7eed..ca754ff 100644
--- a/skel_common/readme_changelog.txt
+++ b/skel_common/readme_changelog.txt
@@ -1,5 +1,8 @@
 Changelog
 
+1.4:
+- Cleaned up some dodgy code when initially prompting for FTL's location
+
 1.3:
 - Added "Return FTL to an unmodded state before switching to a new version"
 - Fixed advanced find tags' panic arg (was "true" all the time)
diff --git a/src/main/java/net/vhati/modmanager/FTLModManager.java b/src/main/java/net/vhati/modmanager/FTLModManager.java
index 457ff5a..43927bf 100644
--- a/src/main/java/net/vhati/modmanager/FTLModManager.java
+++ b/src/main/java/net/vhati/modmanager/FTLModManager.java
@@ -25,7 +25,7 @@ public class FTLModManager {
 	private static final Logger log = LogManager.getLogger(FTLModManager.class);
 
 	public static final String APP_NAME = "Slipstream Mod Manager";
-	public static final ComparableVersion APP_VERSION = new ComparableVersion( "1.3" );
+	public static final ComparableVersion APP_VERSION = new ComparableVersion( "1.4" );
 	public static final String APP_URL = "http://www.ftlgame.com/forum/viewtopic.php?f=12&t=17102";
 	public static final String APP_AUTHOR = "Vhati";
 
@@ -33,6 +33,20 @@ public class FTLModManager {
 	public static void main( String[] args ) {
 		if ( args.length > 0 ) SlipstreamCLI.main( args );
 
+
+		// Ensure all popups are triggered from the event dispatch thread.
+
+		SwingUtilities.invokeLater(new Runnable() {
+			@Override
+			public void run() {
+				guiInit();
+			}
+		});
+	}
+
+
+	private static void guiInit() {
+
 		log.debug( String.format( "%s v%s", APP_NAME, APP_VERSION ) );
 		log.debug( String.format( "%s %s", System.getProperty("os.name"), System.getProperty("os.version") ) );
 		log.debug( String.format( "%s, %s, %s", System.getProperty("java.vm.name"), System.getProperty("java.version"), System.getProperty("os.arch") ) );
@@ -156,7 +170,7 @@ public class FTLModManager {
 		}
 
 
-		final SlipstreamConfig appConfig = new SlipstreamConfig( config, configFile );
+		SlipstreamConfig appConfig = new SlipstreamConfig( config, configFile );
 		if ( writeConfig ) {
 			try {
 				appConfig.writeConfig();
@@ -168,20 +182,15 @@ public class FTLModManager {
 			}
 		}
 
-		// Create the GUI.
-		SwingUtilities.invokeLater(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					ManagerFrame frame = new ManagerFrame( appConfig, APP_NAME, APP_VERSION, APP_URL, APP_AUTHOR );
-					frame.init();
-					frame.setVisible(true);
-				} catch ( Exception e ) {
-					log.error( "Exception while creating ManagerFrame.", e );
-					System.exit(1);
-				}
-			}
-		});
+		// Create the main window.
+		try {
+			ManagerFrame frame = new ManagerFrame( appConfig, APP_NAME, APP_VERSION, APP_URL, APP_AUTHOR );
+			frame.init();
+			frame.setVisible(true);
+		} catch ( Exception e ) {
+			log.error( "Exception while creating ManagerFrame.", e );
+			System.exit(1);
+		}
 	}