From 0416f834486226137fce71aee7347e7e8698bc22 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Wed, 22 Nov 2017 20:06:08 -0800
Subject: [PATCH] Fixed broken menus

---
 .bin/Scripts/activate.py         | 3 +--
 .bin/Scripts/check_disk.py       | 4 +++-
 .bin/Scripts/dism.py             | 9 ++++++---
 .bin/Scripts/functions/common.py | 3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.bin/Scripts/activate.py b/.bin/Scripts/activate.py
index f5f768ad..ae98b933 100644
--- a/.bin/Scripts/activate.py
+++ b/.bin/Scripts/activate.py
@@ -37,11 +37,10 @@ if __name__ == '__main__':
             {'Name': 'Quit', 'Letter': 'Q'},
             ]
 
-        # Main loop
         while True:
             selection = menu_select(
                 '{}: Windows Activation Menu'.format(KIT_NAME_FULL),
-                activation_methods, actions)
+                main_entries=activation_methods, action_entries=actions)
 
             if (selection.isnumeric()):
                 activation_methods[int(selection)-1]['Function']()
diff --git a/.bin/Scripts/check_disk.py b/.bin/Scripts/check_disk.py
index 69ff430f..f1cbb0ab 100644
--- a/.bin/Scripts/check_disk.py
+++ b/.bin/Scripts/check_disk.py
@@ -28,7 +28,9 @@ if __name__ == '__main__':
             {'Name': 'Schedule CHKDSK scan (offline repair)', 'Repair': True}]
         actions = [{'Name': 'Quit', 'Letter': 'Q'}]
         selection = menu_select(
-            '{}: Check Disk Menu\n'.format(KIT_NAME_FULL), options, actions)
+            '{}: Check Disk Menu\n'.format(KIT_NAME_FULL),
+            main_entries=options,
+            action_entries=actions)
         print_info('{}: Check Disk Menu\n'.format(KIT_NAME_FULL))
         if selection == 'Q':
             abort()
diff --git a/.bin/Scripts/dism.py b/.bin/Scripts/dism.py
index 0e088f30..5d969ec2 100644
--- a/.bin/Scripts/dism.py
+++ b/.bin/Scripts/dism.py
@@ -23,12 +23,15 @@ if __name__ == '__main__':
                 'GenericRepair':        'Repaired',
                 'UnsupportedOSError':   'Unsupported OS',
             }}
+        disabled = bool(global_vars['OS']['Version'] not in ['8', '10'])
         options = [
-            {'Name': 'Check Health', 'Repair': False},
-            {'Name': 'Restore Health', 'Repair': True}]
+            {'Name': 'Check Health', 'Repair': False, 'Disabled': disabled},
+            {'Name': 'Restore Health', 'Repair': True, 'Disabled': disabled}]
         actions = [{'Name': 'Quit', 'Letter': 'Q'}]
         selection = menu_select(
-            '{}: DISM Menu\n'.format(KIT_NAME_FULL), options, actions)
+            '{}: DISM Menu\n'.format(KIT_NAME_FULL),
+            main_entries=options,
+            action_entries=actions)
         print_info('{}: DISM Menu\n'.format(KIT_NAME_FULL))
         if selection == 'Q':
             abort()
diff --git a/.bin/Scripts/functions/common.py b/.bin/Scripts/functions/common.py
index 6b819ce3..ff373776 100644
--- a/.bin/Scripts/functions/common.py
+++ b/.bin/Scripts/functions/common.py
@@ -59,6 +59,7 @@ class UnsupportedOSError(Exception):
 def abort():
     """Abort script."""
     print_warning('Aborted.')
+    sleep(5)
     exit_script()
 
 def ask(prompt='Kotaero!'):
@@ -234,7 +235,7 @@ def menu_select(title='~ Untitled Menu ~',
                 width =     width,
                 name =      entry.get('Display Name', entry['Name']))
         if entry.get('Disabled', False):
-            entry_str = '{YELLOW}{entry_str} ({disabled}){CLEAR}\n'.format(
+            entry_str = '{YELLOW}{entry_str} ({disabled}){CLEAR}'.format(
                 entry_str = entry_str,
                 disabled =  disabled_label,
                 **COLORS)