remove contexts last in update

beyond-all-reason · Apr 15, 2024 · 27654c0 · 27654c0
1 parent 0d7d2ec
commit 27654c0
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/rts/Rml/Backends/RmlUi_Backend.cpp b/rts/Rml/Backends/RmlUi_Backend.cpp
@@ -328,13 +328,6 @@ void RmlGui::Update()
 	for (const auto& context : state->contexts) {
 		context->Update();
 	}
-
-	if unlikely(!state->contexts_to_remove.empty()) {
-		for (const auto& context : state->contexts_to_remove) {
-			Rml::RemoveContext(context->GetName());
-		}
-		state->contexts_to_remove.clear();
-	}
 
 	if (state->clicked_context) {
 		auto context_pos = std::ranges::find(state->contexts, state->clicked_context);
@@ -348,6 +341,13 @@ void RmlGui::Update()
 		}
 		state->clicked_context = nullptr;
 	}
+
+	if unlikely(!state->contexts_to_remove.empty()) {
+		for (const auto& context : state->contexts_to_remove) {
+			Rml::RemoveContext(context->GetName());
+		}
+		state->contexts_to_remove.clear();
+	}
 #endif
 }