Amend/Improve 'HelpScan/HelpIcon' Features

dakanji · Sep 9, 2024 · 314596d · 314596d
1 parent 28915fb
commit 314596d
Show file tree

Hide file tree

Showing 9 changed files with 198 additions and 225 deletions.
diff --git a/BootMaster/config.c b/BootMaster/config.c
@@ -146,7 +146,7 @@ VOID SyncLinuxPrefixes (VOID) {
             LINUX_PREFIXES
         );
     }
-    else if (GlobalConfig.HelpScan) {
+    else {
         MergeUniqueItems (
             &GlobalConfig.LinuxPrefixes,
             LINUX_PREFIXES, L','
@@ -163,7 +163,7 @@ VOID SyncAlsoScan (VOID) {
             ALSO_SCAN_DIRS
         );
     }
-    else if (GlobalConfig.HelpScan) {
+    else {
         MergeUniqueItems (
             &GlobalConfig.AlsoScan,
             ALSO_SCAN_DIRS, L','
@@ -216,16 +216,13 @@ VOID SyncDontScanFiles (VOID) {
             DONT_SCAN_FILES
         );
     }
-    else if (GlobalConfig.HelpScan) {
+    else {
         MergeUniqueItems (
             &GlobalConfig.DontScanFiles,
             DONT_SCAN_FILES, L','
         );
     }
 
-    if (!GlobalConfig.HelpScan) {
-        return;
-    }
 
     // Handle MEMTEST_NAMES in 'ScanLoaderDir' and not here
     // to accomodate fallback loaders in the list.
@@ -3463,18 +3460,6 @@ VOID ReadConfig (
             DeclineSetting = HandleBoolean (TokenList, TokenCount);
             GlobalConfig.HelpText = (DeclineSetting) ? FALSE : TRUE;
         }
-        else if (MyStriCmp (TokenList[0], L"decline_help_scan")) {
-            #if REFIT_DEBUG > 0
-            if (!OuterLoop) {
-                UpdatedToken = LogUpdate (
-                    TokenList[0], NotRunBefore, TRUE
-                );
-            }
-            #endif
-
-            DeclineSetting = HandleBoolean (TokenList, TokenCount);
-            GlobalConfig.HelpScan = (DeclineSetting) ? FALSE : TRUE;
-        }
         else if (MyStriCmp (TokenList[0], L"decline_help_size")) {
             #if REFIT_DEBUG > 0
             if (!OuterLoop) {

diff --git a/BootMaster/global.h b/BootMaster/global.h
@@ -549,7 +549,6 @@ typedef struct {
     BOOLEAN                     HiddenTags;
     BOOLEAN                     LegacySync;
     BOOLEAN                     HelpIcon;
-    BOOLEAN                     HelpScan;
     BOOLEAN                     HelpSize;
     BOOLEAN                     HelpText;
     BOOLEAN                     SetAppleFB;