From d37048e4e4a6a599a25d923ca2f96d96831eb177 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Fri, 13 Jun 2025 20:54:50 +1000
Subject: [PATCH] FullscreenUI: Fix animation glitch on choice select

---
 src/util/imgui_fullscreen.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/imgui_fullscreen.cpp b/src/util/imgui_fullscreen.cpp
index 5690fd12d..6bfe388d9 100644
--- a/src/util/imgui_fullscreen.cpp
+++ b/src/util/imgui_fullscreen.cpp
@@ -2923,10 +2923,10 @@ void ImGuiFullscreen::ChoiceDialog::Draw()
     // because the callback may open another dialog, and we don't want to close that one.
     if (!m_checkable)
     {
-      const ChoiceDialogOptions options = std::exchange(m_options, ChoiceDialogOptions());
+      const auto selected = m_options[choice];
       const ChoiceDialogCallback callback = std::exchange(m_callback, ChoiceDialogCallback());
       StartClose();
-      callback(choice, options[choice].first, options[choice].second);
+      callback(choice, selected.first, selected.second);
     }
     else
     {