From 63fc9e198a1d97d9d8d4189e1b2bd4dc829a684f Mon Sep 17 00:00:00 2001 From: jief666 Date: Fri, 4 Sep 2020 10:06:11 +0300 Subject: [PATCH] targetLoaderEntry was used when NULL. --- rEFIt_UEFI/entry_scan/loader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rEFIt_UEFI/entry_scan/loader.cpp b/rEFIt_UEFI/entry_scan/loader.cpp index 9a702ef39..0a7798eef 100644 --- a/rEFIt_UEFI/entry_scan/loader.cpp +++ b/rEFIt_UEFI/entry_scan/loader.cpp @@ -746,10 +746,10 @@ STATIC LOADER_ENTRY *CreateLoaderEntry(IN CONST XStringW& LoaderPath, if (ThemeX.HideBadges & HDBADGES_SHOW) { if (ThemeX.HideBadges & HDBADGES_SWAP) { Entry->BadgeImage.Image = XImage(Entry->DriveImage.Image, 0); - DBG(" Show badge as Drive."); + DBG(" Show badge as Drive.\n"); } else { Entry->BadgeImage.Image = XImage(Entry->Image.Image, 0); - DBG(" Show badge as OSImage."); + DBG(" Show badge as OSImage.\n"); } if (!Entry->BadgeImage.Image.isEmpty()) { Entry->BadgeImage.setFilled(); @@ -1528,7 +1528,7 @@ VOID ScanLoader(VOID) } 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); //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 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); }