From 11a3fd29118f90082590150e5882f90a684e74e4 Mon Sep 17 00:00:00 2001
From: vit9696 <vit9696@users.noreply.github.com>
Date: Tue, 5 May 2020 20:01:39 +0300
Subject: [PATCH] OpenCoreMisc: Use builtin picker when external picker fails
 to load

---
 Changelog.md                     | 1 +
 Platform/OpenCore/OpenCoreMisc.c | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 9fd39057..a7b8585b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@ OpenCore Changelog
 - Fixed unrecognised select `com.apple.recovery.boot` entries
 - Changed NVRAM reset not to erase `BootProtect` boot options
 - Improved boot performance when picker UI is disabled
+- Enforced the use of builtin picker when external fails
 
 #### v0.5.8
 - Fixed invalid CPU object reference in SSDT-PLUG
diff --git a/Platform/OpenCore/OpenCoreMisc.c b/Platform/OpenCore/OpenCoreMisc.c
index 3197f6e1..61552988 100644
--- a/Platform/OpenCore/OpenCoreMisc.c
+++ b/Platform/OpenCore/OpenCoreMisc.c
@@ -713,9 +713,15 @@ OcMiscBoot (
 
   if (Interface != NULL) {
     Status = Interface->ShowInteface (Interface, Storage, Context);
+    DEBUG ((DEBUG_WARN, "OC: External interface failure, fallback to builtin - %r\n", Status));
   } else {
+    Status = EFI_UNSUPPORTED;
+  }
+
+  if (EFI_ERROR (Status)) {
     Status = OcRunBootPicker (Context);
   }
+
   if (EFI_ERROR (Status)) {
     DEBUG ((DEBUG_ERROR, "OC: Failed to show boot menu!\n"));
   }
-- 
GitLab