Merge pull request #82582 from akien-mga/openxr-1.0.30

openxr: Sync with upstream 1.0.30

1 files changed, 16 insertions, 14 deletions

diff --git a/thirdparty/openxr/src/loader/api_layer_interface.cpp b/thirdparty/openxr/src/loader/api_layer_interface.cpp
index 5560c31a52..c9e24ec40b 100644
--- a/thirdparty/openxr/src/loader/api_layer_interface.cpp
+++ b/thirdparty/openxr/src/loader/api_layer_interface.cpp
@@ -237,21 +237,23 @@ XrResult ApiLayerInterface::LoadApiLayers(const std::string& openxr_command, uin
         for (const auto& layer_name : enabled_explicit_api_layer_names) {
             bool found_this_layer = false;
 
-            for (auto it = explicit_layer_manifest_files.begin(); it != explicit_layer_manifest_files.end();) {
-                bool erased_layer_manifest_file = false;
-
-                if (layers_already_found.count(layer_name) > 0) {
-                    found_this_layer = true;
-                } else if (layer_name == (*it)->LayerName()) {
-                    found_this_layer = true;
-                    layers_already_found.insert(layer_name);
-                    enabled_layer_manifest_files_in_init_order.push_back(std::move(*it));
-                    it = explicit_layer_manifest_files.erase(it);
-                    erased_layer_manifest_file = true;
-                }
+            if (layers_already_found.count(layer_name) > 0) {
+                found_this_layer = true;
+            } else {
+                for (auto it = explicit_layer_manifest_files.begin(); it != explicit_layer_manifest_files.end();) {
+                    bool erased_layer_manifest_file = false;
+
+                    if (layer_name == (*it)->LayerName()) {
+                        found_this_layer = true;
+                        layers_already_found.insert(layer_name);
+                        enabled_layer_manifest_files_in_init_order.push_back(std::move(*it));
+                        it = explicit_layer_manifest_files.erase(it);
+                        erased_layer_manifest_file = true;
+                    }
 
-                if (!erased_layer_manifest_file) {
-                    it++;
+                    if (!erased_layer_manifest_file) {
+                        it++;
+                    }
                 }
             }