Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-12-25 16:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make LinuxScan first try preloaded, and if such doesn't exist, load from dir

Browse Source
This commit is contained in:
asava 2020-04-29 02:00:40 +03:00
parent 592b75ff01
commit d521fc1c10
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rEFIt_UEFI/entry_scan/loader.cpp
View File

@ -1305,14 +1305,17 @@ VOID ScanLoader(VOID)
break; break;
} }
} }
XStringW OSIconName = OSName + L",linux"_XSW; DBG(" found entry %ls,linux\n", OSName.wc_str());
DBG(" found entry %ls\n", OSIconName.wc_str());
XStringW LoaderTitle = OSName.subString(0,1); // capitalize first letter for title XStringW LoaderTitle = OSName.subString(0,1); // capitalize first letter for title
LoaderTitle.upperAscii(); LoaderTitle.upperAscii();
LoaderTitle += OSName.subString(1, OSName.length()) + L" Linux"_XSW; LoaderTitle += OSName.subString(1, OSName.length()) + L" Linux"_XSW;
XImage ImageX; //will the image be destroyed or rewritten by next image after the cycle end? XImage ImageX; //will the image be destroyed or rewritten by next image after the cycle end?
// Very few linux icons exist in IconNames, but these few may be preloaded // Very few linux icons exist in IconNames, but these few may be preloaded, so check that first
ImageX = ThemeX.LoadOSIcon(OSIconName); // this tries preloaded first, and if it doesn't exist loads from directory ImageX = ThemeX.GetIcon(L"os_"_XSW + OSName);
if (ImageX.isEmpty()) {
// no preloaded icon, try to load from dir
ImageX.LoadXImage(ThemeX.ThemeDir, (L"os_"_XSW + OSName).wc_str());
}
AddLoaderEntry(File, NullXStringArray, LoaderTitle, Volume, AddLoaderEntry(File, NullXStringArray, LoaderTitle, Volume,
(ImageX.isEmpty() ? NULL : &ImageX), OSTYPE_LINEFI, OSFLAG_NODEFAULTARGS); (ImageX.isEmpty() ? NULL : &ImageX), OSTYPE_LINEFI, OSFLAG_NODEFAULTARGS);
} //anyway continue search other entries } //anyway continue search other entries