Merge pull request #47 from iansan5653/fix/task_remains_open_after_closing

Fix process failing to exit when the user closes

Author: iansan5653

code/main.py

@@ -11,8 +11,12 @@
 from mcta_processing import transform_and_save_mcta_output
 import scoring
 import user_interface
+import sys
 
 user_input = user_interface.MainWindow()
+if (user_input.cancelled):
+    sys.exit(0)
+
 input_folder = user_input.input_folder
 image_paths = file_handling.filter_images(
     file_handling.list_file_paths(input_folder))

code/user_interface.py

@@ -453,6 +453,7 @@ class MainWindow:
     output_mcta: bool
     debug_mode: bool = False
     form_variant: FormVariantSelection
+    cancelled: bool = False
 
     def __init__(self):
         app: tk.Tk = tk.Tk()
@@ -462,6 +463,8 @@ def __init__(self):
         iconpath = str(Path(__file__).parent / "assets" / "icon.ico")
         app.iconbitmap(iconpath)
 
+        app.protocol("WM_DELETE_WINDOW", self.__on_close)
+
         self.__input_folder_picker = InputFolderPickerWidget(
             app, self.__on_update)
         self.__answer_key_picker = AnswerKeyPickerWidget(app, self.__on_update)
@@ -616,5 +619,10 @@ def __show_sheet(self):
                 "multiple_choice_sheet_150q.pdf")
             subprocess.Popen([helpfile], shell=True)
 
+    def __on_close(self):
+        self.__app.destroy()
+        self.__ready_to_continue.set(1)
+        self.cancelled = True
+
     def create_and_pack_progress(self, maximum: int) -> ProgressTrackerWidget:
         return ProgressTrackerWidget(self.__app, maximum)