From 48a7e997843007f1e7f777c34ad5dded9535137e Mon Sep 17 00:00:00 2001
From: Pieter Hulshoff <pieter@towel42.nl>
Date: Fri, 21 Apr 2017 16:54:11 +0200
Subject: [PATCH] Fixed incorrect art loading when pressing next/previous
 letter during highlight animation.

---
 RetroFE/Source/RetroFE.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 32323bb..bd89e0b 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -432,9 +432,12 @@ void RetroFE::run()
             break;
 
         case RETROFE_HIGHLIGHT_ENTER:
-            if (currentPage_->isMenuIdle() && processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST)
+            RETROFE_STATE state_tmp;
+            if (currentPage_->isMenuIdle() &&
+                ((state_tmp = processUserInput(currentPage_)) == RETROFE_HIGHLIGHT_REQUEST ||
+                  state_tmp                                   == RETROFE_MENUJUMP_REQUEST) )
             {
-                state = RETROFE_HIGHLIGHT_REQUEST;
+                state = state_tmp;
             }
             else if (currentPage_->isIdle())
             {
@@ -870,6 +873,8 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
        !input_.keystate(UserInput::KeyCodeRight) &&
        !input_.keystate(UserInput::KeyCodePageUp) &&
        !input_.keystate(UserInput::KeyCodePageDown) &&
+       !input_.keystate(UserInput::KeyCodeLetterUp) &&
+       !input_.keystate(UserInput::KeyCodeLetterDown) &&
        !attract_.isActive())
     {
         page->resetScrollPeriod();