Update main file to actually run

DC37 · Mar 4, 2019 · f7cec0b · f7cec0b
1 parent bd9b108
commit f7cec0b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 Super Mario Paint
 ==========
-* Current Version: 1.2.0
+* Current Version: 1.2.1
 
 Help would be very much appreciated! If you manage to debug something, submit a pull request and I'll review it and (hopefully) merge it in.
 
@@ -15,7 +15,7 @@ Accepting cryptocurrency donations!
 Major Releases:
 -----
 See "Version History.txt" for semantic versioning and more release notes.
-* March 4, 2019 - v1.2.0 release
+* March 4, 2019 - v1.2.1 release
 * February 4, 2018 - v1.1.1 release
 * January 29, 2018 - First relatively major functionality upgrade, v1.1.0
 * June 2017 - Addition of team member j574y923 

diff --git a/Version History.txt b/Version History.txt
@@ -1,4 +1,4 @@
-v1.2.0
+v1.2.0 / v1.2.1
 FIXES
 Fixed song name text field focus issues--click anywhere other than the text field to defocus it
 NEW FEATURES
@@ -11,6 +11,7 @@ Bind the soundfont to the song
 Load song's soundfont when loading song
 Load soundfonts for every song in an arrangement
 Load existing soundfonts from AppData
+(v1.2.1 is a bugfix on the main window loading)
 
 v1.1.1
 NEW FEATURES

diff --git a/src/smp/SuperMarioPaint.java b/src/smp/SuperMarioPaint.java
@@ -55,7 +55,7 @@
  * @author j574y923
  * 
  * @since 2012.08.16
- * @version 1.2.0
+ * @version 1.2.1
  */
 public class SuperMarioPaint extends Application {
 
@@ -395,34 +395,34 @@ public void changed(ObservableValue<? extends Boolean> ov,
      * @param args
      *            Sets debug options on or off.
      */
-//    public static void main(String[] args) {
-//        if (args.length == 0) {
-//            try {
-//                LauncherImpl.launchApplication(SuperMarioPaint.class,
-//                        SplashScreen.class, args);
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//            }
-//        } else if (args.length > 0
-//                && (args[0].equals("--debug") || args[0].equals("--d"))) {
-//            if (args[1] != null) {
-//                try {
-//                    Settings.setDebug(Integer.parseInt(args[1]));
-//                } catch (NumberFormatException e) {
-//                    Settings.setDebug(1);
-//                }
-//            } else {
-//                Settings.setDebug(1);
-//            }
-//            try {
-//                LauncherImpl.launchApplication(SuperMarioPaint.class,
-//                        SplashScreen.class, args);
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//            }
-//        }
-//
-//	}
+    public static void main(String[] args) {
+        if (args.length == 0) {
+            try {
+                LauncherImpl.launchApplication(SuperMarioPaint.class,
+                        SplashScreen.class, args);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else if (args.length > 0
+                && (args[0].equals("--debug") || args[0].equals("--d"))) {
+            if (args[1] != null) {
+                try {
+                    Settings.setDebug(Integer.parseInt(args[1]));
+                } catch (NumberFormatException e) {
+                    Settings.setDebug(1);
+                }
+            } else {
+                Settings.setDebug(1);
+            }
+            try {
+                LauncherImpl.launchApplication(SuperMarioPaint.class,
+                        SplashScreen.class, args);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+	}
 
 	/**
 	 * Gets the soundfont Loader. This function will probably only be temporary

diff --git a/src/smp/stateMachine/Settings.java b/src/smp/stateMachine/Settings.java
@@ -16,7 +16,7 @@
 public class Settings {
 
     /** The current version number of this program. */
-    public final static String version = "v1.2.0";
+    public final static String version = "v1.2.1";
 
     /** The name of the file that we write to. */
     private final static String settingsFile = "settings.data";