From 652e9d52dcf6127ca1fb7d198c8225c934c7ae6f Mon Sep 17 00:00:00 2001
From: Hyper <34012267+hyperbx@users.noreply.github.com>
Date: Sun, 8 Dec 2024 03:41:39 +0000
Subject: [PATCH] message_window: fix missing button guide for optionless
 messages

---
 UnleashedRecomp/ui/message_window.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/UnleashedRecomp/ui/message_window.cpp b/UnleashedRecomp/ui/message_window.cpp
index d12bb7f..aeb1da6 100644
--- a/UnleashedRecomp/ui/message_window.cpp
+++ b/UnleashedRecomp/ui/message_window.cpp
@@ -236,6 +236,17 @@ void DrawButton(int rowIndex, float yOffset, float width, float height, std::str
     );
 }
 
+void DrawNextButtonGuide(bool isController, bool isKeyboard)
+{
+    auto icon = isController
+        ? EButtonIcon::A
+        : isKeyboard
+            ? EButtonIcon::Enter
+            : EButtonIcon::LMB;
+
+    ButtonGuide::Open(Button(Localise("Common_Next"), icon));
+}
+
 static void ResetSelection()
 {
     g_selectedRowIndex = g_defaultButtonIndex;
@@ -391,13 +402,7 @@ void MessageWindow::Draw()
             }
             else
             {
-                auto icon = isController
-                    ? EButtonIcon::A
-                    : isKeyboard
-                        ? EButtonIcon::Enter
-                        : EButtonIcon::LMB;
-
-                ButtonGuide::Open(Button(Localise("Common_Next"), icon));
+                DrawNextButtonGuide(isController, isKeyboard);
 
                 if (!g_isControlsVisible && g_isAccepted)
                 {
@@ -411,6 +416,8 @@ void MessageWindow::Draw()
         }
         else
         {
+            DrawNextButtonGuide(isController, isKeyboard);
+
             if (g_isAccepted)
             {
                 g_result = 0;