From a07faf7ca3f1d29365a48fa0cbf3b933573220d7 Mon Sep 17 00:00:00 2001
From: gir489 <100792176+gir489returns@users.noreply.github.com>
Date: Fri, 3 Nov 2023 16:30:52 -0400
Subject: [PATCH] Fixed persist vehicle preview system only working if you
 hovered over the delete button. (#2379)

---
 src/views/vehicle/spawn/view_persist_car.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/vehicle/spawn/view_persist_car.cpp b/src/views/vehicle/spawn/view_persist_car.cpp
index 9948412c..0d18161f 100644
--- a/src/views/vehicle/spawn/view_persist_car.cpp
+++ b/src/views/vehicle/spawn/view_persist_car.cpp
@@ -125,7 +125,8 @@ namespace big
 				std::transform(pair_lower.begin(), pair_lower.end(), pair_lower.begin(), tolower);
 				if (pair_lower.contains(lower_search))
 				{
-					if (ImGui::Selectable(pair.c_str(), selected_vehicle_file == pair, ImGuiSelectableFlags_AllowItemOverlap))
+					auto file_name = pair.c_str();
+					if (ImGui::Selectable(file_name, selected_vehicle_file == pair, ImGuiSelectableFlags_AllowItemOverlap))
 					{
 						selected_vehicle_file = pair;
 						g_fiber_pool->queue_job([] {
@@ -134,14 +135,6 @@ namespace big
 						});
 					}
 
-					ImGui::SameLine();
-					ImGui::PushID(pair.c_str());
-					if (ImGui::SmallButton("X"))
-					{
-						file_name_to_delete = pair;
-					}
-					ImGui::PopID();
-
 					if (!g.persist_car.preview_vehicle || (g.persist_car.preview_vehicle && !ImGui::IsAnyItemHovered()))
 					{
 						g_model_preview_service->stop_preview();
@@ -152,6 +145,14 @@ namespace big
 							g_model_preview_service->show_vehicle_persisted(pair);
 						});
 					}
+
+					ImGui::SameLine();
+					ImGui::PushID(file_name);
+					if (ImGui::SmallButton("X"))
+					{
+						file_name_to_delete = pair;
+					}
+					ImGui::PopID();
 				}
 			}