summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar LC2021-04-04 18:16:50 -0400
committerGravatar GitHub2021-04-04 18:16:50 -0400
commit7feb490f83904c7a2724beb89cce20ec7292b07b (patch)
tree6ec5a0a8e3fd86ade87bcf8506b8fa685e2ead7b
parentMerge pull request #6139 from Morph1984/cmake-fix-build (diff)
parentconfigure_graphics: Prevent stack-use-after-scope (diff)
downloadyuzu-7feb490f83904c7a2724beb89cce20ec7292b07b.tar.gz
yuzu-7feb490f83904c7a2724beb89cce20ec7292b07b.tar.xz
yuzu-7feb490f83904c7a2724beb89cce20ec7292b07b.zip
Merge pull request #6141 from lat9nq/cfg_gphcs_stack_use
configure_graphics: Prevent stack-use-after-scope
-rw-r--r--src/yuzu/configuration/configure_graphics.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 9ff32aec4..49acc48b2 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -227,7 +227,7 @@ void ConfigureGraphics::RetrieveVulkanDevices() try {
227 vulkan_devices.clear(); 227 vulkan_devices.clear();
228 vulkan_devices.reserve(physical_devices.size()); 228 vulkan_devices.reserve(physical_devices.size());
229 for (const VkPhysicalDevice device : physical_devices) { 229 for (const VkPhysicalDevice device : physical_devices) {
230 const char* const name = vk::PhysicalDevice(device, dld).GetProperties().deviceName; 230 const std::string name = vk::PhysicalDevice(device, dld).GetProperties().deviceName;
231 vulkan_devices.push_back(QString::fromStdString(name)); 231 vulkan_devices.push_back(QString::fromStdString(name));
232 } 232 }
233 233