From 840dd54faf39b7b6557e9cac5b2f028609760097 Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Tue, 30 Jan 2024 17:38:30 -0500 Subject: [PATCH 1/3] [#2146] Cleanup On CtrlC --- EDMarketConnector.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 690300e6..3bd44015 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -2365,6 +2365,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') From bbd911cfd9abf9848a8babd73bceda985b26394e Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Wed, 7 Feb 2024 19:12:58 -0500 Subject: [PATCH 2/3] [#2146] Cleanup On CtrlC Already Running --- EDMarketConnector.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 3bd44015..523f6236 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -353,7 +353,13 @@ 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() From f4776e83178865b1a558130204d3d2b8cc2fb41f Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Wed, 7 Feb 2024 19:15:18 -0500 Subject: [PATCH 3/3] [Eyeroll] --- EDMarketConnector.py | 1 - 1 file changed, 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 523f6236..8a0cb3f5 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -360,7 +360,6 @@ if __name__ == '__main__': # noqa: C901 sys.exit() logger.info('Exiting') - journal_lock = JournalLock() locked = journal_lock.obtain_lock()