BUGFIX: exit software when window close button is pressed

MethodicConfigurator/frontend_tkinter_connection_selection.py

@@ -196,7 +196,7 @@ class ConnectionSelectionWindow(BaseWindow):
     def __init__(self, flight_controller: FlightController, connection_result_string: str):
         super().__init__()
         self.root.title("Flight controller connection")
-        self.root.geometry("400x500") # Set the window size
+        self.root.geometry("400x510") # Set the window size
 
         # Explain why we are here
         if flight_controller.comport is None:
@@ -243,7 +243,13 @@ def __init__(self, flight_controller: FlightController, connection_result_string
         skip_fc_connection_button = tk.Button(option3_label_frame,
                                               text="Skip FC connection, just edit the .param files on disk",
                                               command=self.skip_fc_connection)
-        skip_fc_connection_button.pack(expand=False, fill=tk.X, padx=20, pady=6)
+        skip_fc_connection_button.pack(expand=False, fill=tk.X, padx=15, pady=6)
+
+        # Bind the close_connection_and_quit function to the window close event
+        self.root.protocol("WM_DELETE_WINDOW", self.close_and_quit)
+
+    def close_and_quit(self):
+        sys_exit(0)
 
     def fc_autoconnect(self):
         self.connection_selection_widgets.reconnect()

MethodicConfigurator/frontend_tkinter_directory_selection.py

@@ -11,6 +11,8 @@
 
 from argparse import ArgumentParser
 
+from sys import exit as sys_exit
+
 from copy import deepcopy
 
 from logging import basicConfig as logging_basicConfig
@@ -187,6 +189,12 @@ def __init__(self, local_filesystem: LocalFilesystem):
                                     "MyVehicleName")
         self.create_option2_widgets()
 
+        # Bind the close_connection_and_quit function to the window close event
+        self.root.protocol("WM_DELETE_WINDOW", self.close_and_quit)
+
+    def close_and_quit(self):
+        sys_exit(0)
+
     def create_option1_widgets(self, initial_template_dir: str, initial_base_dir: str, initial_new_dir: str):
         # Option 1 - Create a new vehicle configuration directory based on a existing template
         option1_label_frame = tk.LabelFrame(self.root, text="Option 1")