diff --git a/src/launcher/Launcher.java b/src/launcher/Launcher.java index a7b2dea..c03236b 100644 --- a/src/launcher/Launcher.java +++ b/src/launcher/Launcher.java @@ -134,10 +134,10 @@ public class Launcher extends Application { b1.setItems(availablechar); b2.setItems(availablechar); // Setting default ChoiceBoxes values to the ones already in the config file - if(setter.getChar1().equals("blue")) { + if(setter.getChar1().equals("blue") || setter.getChar1().equals("default")) { b1.setValue("Blue"); } - if(setter.getChar2().equals("blue")) { + if(setter.getChar2().equals("blue") || setter.getChar2().equals("default")) { b2.setValue("Blue"); } @@ -168,9 +168,9 @@ public class Launcher extends Application { setter.setSettings(); match.main(null); } catch (Exception e) { - e.printStackTrace(); - System.exit(1); + System.out.println("Fill all boxes to launch the game"); } + } /** diff --git a/src/launcher/Settings.java b/src/launcher/Settings.java index b4d80ee..6a3e12e 100644 --- a/src/launcher/Settings.java +++ b/src/launcher/Settings.java @@ -94,7 +94,6 @@ public class Settings { e.printStackTrace(); System.exit(1); } catch (ParseException e) { - System.out.println("Invalid config file"); rounds = 3; p1 = "default"; p2 = "default";