mirror of
https://github.com/CloverHackyColor/CloverBootloader.git
synced 2024-11-23 11:35:19 +01:00
targetLoaderEntry was used when NULL.
This commit is contained in:
parent
87bc06495c
commit
63fc9e198a
@ -746,10 +746,10 @@ STATIC LOADER_ENTRY *CreateLoaderEntry(IN CONST XStringW& LoaderPath,
|
|||||||
if (ThemeX.HideBadges & HDBADGES_SHOW) {
|
if (ThemeX.HideBadges & HDBADGES_SHOW) {
|
||||||
if (ThemeX.HideBadges & HDBADGES_SWAP) {
|
if (ThemeX.HideBadges & HDBADGES_SWAP) {
|
||||||
Entry->BadgeImage.Image = XImage(Entry->DriveImage.Image, 0);
|
Entry->BadgeImage.Image = XImage(Entry->DriveImage.Image, 0);
|
||||||
DBG(" Show badge as Drive.");
|
DBG(" Show badge as Drive.\n");
|
||||||
} else {
|
} else {
|
||||||
Entry->BadgeImage.Image = XImage(Entry->Image.Image, 0);
|
Entry->BadgeImage.Image = XImage(Entry->Image.Image, 0);
|
||||||
DBG(" Show badge as OSImage.");
|
DBG(" Show badge as OSImage.\n");
|
||||||
}
|
}
|
||||||
if (!Entry->BadgeImage.Image.isEmpty()) {
|
if (!Entry->BadgeImage.Image.isEmpty()) {
|
||||||
Entry->BadgeImage.setFilled();
|
Entry->BadgeImage.setFilled();
|
||||||
@ -1528,7 +1528,7 @@ VOID ScanLoader(VOID)
|
|||||||
} else {
|
} else {
|
||||||
AddLoaderEntry(SWPrintf("\\%s\\System\\Library\\CoreServices\\boot.efi", ApfsTargetUUID.c_str()), NullXString8Array, L""_XSW, L"FileVault Prebooter"_XSW, Volume, Volume->ApfsTargetUUIDArray[i], NULL, OSTYPE_OSX, 0);
|
AddLoaderEntry(SWPrintf("\\%s\\System\\Library\\CoreServices\\boot.efi", ApfsTargetUUID.c_str()), NullXString8Array, L""_XSW, L"FileVault Prebooter"_XSW, Volume, Volume->ApfsTargetUUIDArray[i], NULL, OSTYPE_OSX, 0);
|
||||||
//Try to add Recovery APFS entry
|
//Try to add Recovery APFS entry
|
||||||
AddLoaderEntry(SWPrintf("\\%s\\boot.efi", Volume->ApfsTargetUUIDArray[i].c_str()), NullXString8Array, SWPrintf("Boot Mac OS X Recovery for %ls via %ls", targetLoaderEntry->DisplayedVolName.wc_str(), Volume->VolName.wc_str()), L""_XSW, Volume, Volume->ApfsTargetUUIDArray[i], NULL, OSTYPE_RECOVERY, 0);
|
AddLoaderEntry(SWPrintf("\\%s\\boot.efi", Volume->ApfsTargetUUIDArray[i].c_str()), NullXString8Array, SWPrintf("Boot Mac OS X Recovery via %ls", Volume->VolName.wc_str()), L""_XSW, Volume, Volume->ApfsTargetUUIDArray[i], NULL, OSTYPE_RECOVERY, 0);
|
||||||
//Try to add macOS install entry
|
//Try to add macOS install entry
|
||||||
AddLoaderEntry(SWPrintf("\\%s\\com.apple.installer\\boot.efi", Volume->ApfsTargetUUIDArray[i].c_str()), NullXString8Array, L""_XSW, L"macOS Install Prebooter"_XSW, Volume, Volume->ApfsTargetUUIDArray[i], NULL, OSTYPE_OSX_INSTALLER, 0);
|
AddLoaderEntry(SWPrintf("\\%s\\com.apple.installer\\boot.efi", Volume->ApfsTargetUUIDArray[i].c_str()), NullXString8Array, L""_XSW, L"macOS Install Prebooter"_XSW, Volume, Volume->ApfsTargetUUIDArray[i], NULL, OSTYPE_OSX_INSTALLER, 0);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user