From a19ac4772b52d78734570d797120a91d610156cf Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 26 Jul 2018 18:29:14 -0600
Subject: [PATCH] Better exception handling

---
 .bin/Scripts/ddrescue-tui-menu | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.bin/Scripts/ddrescue-tui-menu b/.bin/Scripts/ddrescue-tui-menu
index 798cd43e..10cde744 100755
--- a/.bin/Scripts/ddrescue-tui-menu
+++ b/.bin/Scripts/ddrescue-tui-menu
@@ -38,12 +38,21 @@ if __name__ == '__main__':
             if not re.search(r'(^$|help|-h|\?)', run_mode, re.IGNORECASE):
                 print_error('Invalid mode.')
             show_usage(script_name)
-        exit_script()
         
         # Done
         print_standard('\nDone.')
         pause("Press Enter to exit...")
         exit_script()
+    except GenericAbort as ga:
+        if str(ga):
+            print_warning(str(ga))
+        abort()
+    except GenericError as ge:
+        if str(ge):
+            print_error(str(ge))
+        else:
+            print_error('Generic Error?')
+        abort()
     except SystemExit:
         pass
     except: