Fixed an icon display bug & very minor incorrect error message bug.

[refind] / refind / config.c

diff --git a/refind/config.c b/refind/config.c
index c2f6ba446aed8cea08dbf5b742a33793984fe5f3..955948b7abbc740bc88da0235b42d655651293ab 100644 (file)
--- a/refind/config.c
+++ b/refind/config.c
@@ -81,7 +81,7 @@ static EFI_STATUS ReadFile(IN EFI_FILE_HANDLE BaseDir, CHAR16 *FileName, REFIT_F
     Status = refit_call5_wrapper(BaseDir->Open, BaseDir, &FileHandle, FileName, EFI_FILE_MODE_READ, 0);
     if (CheckError(Status, L"while loading the configuration file"))
         return Status;
-    
+
     FileInfo = LibFileInfo(FileHandle);
     if (FileInfo == NULL) {
         // TODO: print and register the error
@@ -92,7 +92,7 @@ static EFI_STATUS ReadFile(IN EFI_FILE_HANDLE BaseDir, CHAR16 *FileName, REFIT_F
     if (ReadSize > MAXCONFIGFILESIZE)
         ReadSize = MAXCONFIGFILESIZE;
     FreePool(FileInfo);
-    
+
     File->BufferSize = (UINTN)ReadSize;   // was limited to a few K before, so this is safe
     File->Buffer = AllocatePool(File->BufferSize);
     Status = refit_call3_wrapper(FileHandle->Read, FileHandle, &File->BufferSize, File->Buffer);
@@ -103,7 +103,7 @@ static EFI_STATUS ReadFile(IN EFI_FILE_HANDLE BaseDir, CHAR16 *FileName, REFIT_F
         return Status;
     }
     Status = refit_call1_wrapper(FileHandle->Close, FileHandle);
-    
+
     // setup for reading
     File->Current8Ptr  = (CHAR8 *)File->Buffer;
     File->End8Ptr      = File->Current8Ptr + File->BufferSize;
@@ -326,27 +326,27 @@ VOID ReadConfig(VOID)
         if (StriCmp(TokenList[0], L"timeout") == 0) {
             HandleInt(TokenList, TokenCount, &(GlobalConfig.Timeout));
 
-        // Note: I'm using "hideui" as equivalent to "disable" for the moment (as of rEFInd 0.2.4)
+        // Note: I'm using "disable" as equivalent to "hideui" for the moment (as of rEFInd 0.2.4)
         // because I've folded two options into one and removed some values, so I want to catch
-        // existing configurations as much as possible. The "hideui" equivalency to "disable" will
-        // be removed sooner or later....
-        } else if ((StriCmp(TokenList[0], L"disable") == 0) || (StriCmp(TokenList[0], L"hideui") == 0)) {
+        // existing configurations as much as possible. The "disable" equivalency to "hideui" will
+        // be removed sooner or later, leaving only "hideui".
+        } else if ((StriCmp(TokenList[0], L"hideui") == 0) || (StriCmp(TokenList[0], L"disable") == 0)) {
             for (i = 1; i < TokenCount; i++) {
                 FlagName = TokenList[i];
                 if (StriCmp(FlagName, L"banner") == 0) {
-                   GlobalConfig.DisableFlags |= DISABLE_FLAG_BANNER;
+                   GlobalConfig.HideUIFlags |= HIDEUI_FLAG_BANNER;
                 } else if (StriCmp(FlagName, L"label") == 0) {
-                   GlobalConfig.DisableFlags |= DISABLE_FLAG_LABEL;
+                   GlobalConfig.HideUIFlags |= HIDEUI_FLAG_LABEL;
                 } else if (StriCmp(FlagName, L"singleuser") == 0) {
-                    GlobalConfig.DisableFlags |= DISABLE_FLAG_SINGLEUSER;
+                    GlobalConfig.HideUIFlags |= HIDEUI_FLAG_SINGLEUSER;
                 } else if (StriCmp(FlagName, L"hwtest") == 0) {
-                    GlobalConfig.DisableFlags |= DISABLE_FLAG_HWTEST;
+                    GlobalConfig.HideUIFlags |= HIDEUI_FLAG_HWTEST;
                 } else if (StriCmp(FlagName, L"arrows") == 0) {
-                   GlobalConfig.DisableFlags |= DISABLE_FLAG_ARROWS;
+                   GlobalConfig.HideUIFlags |= HIDEUI_FLAG_ARROWS;
                 } else if (StriCmp(FlagName, L"all") == 0) {
-                    GlobalConfig.DisableFlags = DISABLE_ALL;
+                    GlobalConfig.HideUIFlags = HIDEUI_ALL;
                 } else {
-                    Print(L" unknown disable flag: '%s'\n", FlagName);
+                    Print(L" unknown hideui flag: '%s'\n", FlagName);
                 }
             }