From e15c0a82a5e6a4449a54b603f92b3a8ff393b3ad Mon Sep 17 00:00:00 2001
From: kerkpy <peiyongkerk@gmail.com>
Date: Thu, 8 Oct 2020 14:17:20 +0800
Subject: [PATCH] Fix bug where exit was not working as intended

---
 src/main/java/parser/Parser.java | 3 ++-
 src/main/java/ui/MainWindow.java | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/parser/Parser.java b/src/main/java/parser/Parser.java
index 0f75001c3c..b4f2e8508d 100644
--- 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
index c26403d953..f59d71b830 100644
--- 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();
     }