From f84681784872d011d11da3eb7de5a4e53459b4cb Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Mon, 22 Jun 2020 15:58:00 +1000
Subject: [PATCH] Vulkan: Fix crash when opening settings window -> resizing

---
 src/frontend-common/vulkan_host_display.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/frontend-common/vulkan_host_display.cpp b/src/frontend-common/vulkan_host_display.cpp
index 399ca3d3f..45584743b 100644
--- a/src/frontend-common/vulkan_host_display.cpp
+++ b/src/frontend-common/vulkan_host_display.cpp
@@ -496,6 +496,9 @@ void VulkanHostDisplay::RenderSoftwareCursor(s32 left, s32 top, s32 width, s32 h
 
 std::vector<std::string> VulkanHostDisplay::EnumerateAdapterNames()
 {
+  if (g_vulkan_context)
+    return Vulkan::Context::EnumerateGPUNames(g_vulkan_context->GetVulkanInstance());
+
   if (Vulkan::LoadVulkanLibrary())
   {
     Common::ScopeGuard lib_guard([]() { Vulkan::UnloadVulkanLibrary(); });
@@ -506,15 +509,11 @@ std::vector<std::string> VulkanHostDisplay::EnumerateAdapterNames()
       Common::ScopeGuard instance_guard([&instance]() { vkDestroyInstance(instance, nullptr); });
 
       if (Vulkan::LoadVulkanInstanceFunctions(instance))
-      {
-        Vulkan::Context::GPUNameList gpus = Vulkan::Context::EnumerateGPUNames(instance);
-        if (!gpus.empty())
-          return gpus;
-      }
+        return Vulkan::Context::EnumerateGPUNames(instance);
     }
   }
 
-  return {"(Default)"};
+  return {};
 }
 
 } // namespace FrontendCommon
\ No newline at end of file