From 819262cf703d01d1d06d1de9f2f3ce0a5edb55a1 Mon Sep 17 00:00:00 2001
From: Phoebe <40956085+C1701D@users.noreply.github.com>
Date: Thu, 8 Feb 2024 01:21:29 +0100
Subject: [PATCH] Merge pull request #2147 from
 HullSeals/enhancement/2146/cleanup-keyboard-interrupt

[#2146] Cleanup On KeyboardInterrupt
LGTM
---
 EDMarketConnector.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/EDMarketConnector.py b/EDMarketConnector.py
index 690300e6..8a0cb3f5 100755
--- a/EDMarketConnector.py
+++ b/EDMarketConnector.py
@@ -353,7 +353,12 @@ if __name__ == '__main__':  # noqa: C901
         button = ttk.Button(frame, text='OK', command=lambda: sys.exit(0))
         button.grid(row=2, column=0, sticky=tk.S)
 
-        root.mainloop()
+        try:
+            root.mainloop()
+        except KeyboardInterrupt:
+            logger.info("Ctrl+C Detected, Attempting Clean Shutdown")
+            sys.exit()
+        logger.info('Exiting')
 
     journal_lock = JournalLock()
     locked = journal_lock.obtain_lock()
@@ -2365,6 +2370,9 @@ sys.path: {sys.path}'''
     # Check for FDEV IDs
     root.after(3, check_fdev_ids)
     # Start the main event loop
-    root.mainloop()
-
+    try:
+        root.mainloop()
+    except KeyboardInterrupt:
+        logger.info("Ctrl+C Detected, Attempting Clean Shutdown")
+        app.onexit()
     logger.info('Exiting')