Merge pull request #9573 from liamwhite/optional

vulkan_device: avoid attempt to access empty optional
2023-01-07 10:40:21 -06:00
parent c0f17e1b27 444b25bae1
commit cc92b7fd94
1 changed files with 6 additions and 2 deletions
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -1520,8 +1520,12 @@ void Device::SetupFamilies(VkSurfaceKHR surface) {
        LOG_ERROR(Render_Vulkan, "Device lacks a present queue");
        throw vk::Exception(VK_ERROR_FEATURE_NOT_PRESENT);
    }
-    graphics_family = *graphics;
-    present_family = *present;
+    if (graphics) {
+        graphics_family = *graphics;
+    }
+    if (present) {
+        present_family = *present;
+    }
 }

 void Device::SetupFeatures() {