Fix bug where exit was not working as intended

kerkpy · Oct 8, 2020 · e15c0a8 · e15c0a8
1 parent a3b1eb8
commit e15c0a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/parser/Parser.java b/src/main/java/parser/Parser.java
@@ -142,7 +142,8 @@ private boolean isValidInput(String fullInput) throws DukeException {
  isValidDate(atString);
  return true;
 
- } else if (fullInput.equals("list") || fullInput.startsWith("delete ") || fullInput.startsWith("done ")) {
+ } else if (fullInput.equals("list") || fullInput.startsWith("delete ") || fullInput.startsWith("done ")
+ || fullInput.equals("bye")) {
  return true;
 
  } else {

diff --git a/src/main/java/ui/MainWindow.java b/src/main/java/ui/MainWindow.java
@@ -2,6 +2,7 @@
 
 import duke.Duke;
 
+import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ScrollPane;
@@ -56,6 +57,9 @@ private void handleUserInput() {
  DialogBox.getUserDialog(userText, userImage),
  DialogBox.getDukeDialog(dukeText, dukeImage)
  );
+ if (userText.equals("bye")) {
+ Platform.exit();
+ }
  userInput.clear();
  }