From 051eec348fa0fb5f3a45ddf906bf0034f30325fb Mon Sep 17 00:00:00 2001
From: Pieter Hulshoff <pieter@towel42.nl>
Date: Thu, 25 Aug 2016 15:25:47 +0200
Subject: [PATCH] Fixed attract mode art selection.

---
 RetroFE/Source/Execute/AttractMode.cpp | 7 ++++++-
 RetroFE/Source/Execute/AttractMode.h   | 1 +
 RetroFE/Source/RetroFE.cpp             | 3 ++-
 RetroFE/Source/Version.cpp             | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/RetroFE/Source/Execute/AttractMode.cpp b/RetroFE/Source/Execute/AttractMode.cpp
index 42154fe..fdebc36 100644
--- a/RetroFE/Source/Execute/AttractMode.cpp
+++ b/RetroFE/Source/Execute/AttractMode.cpp
@@ -53,7 +53,12 @@ void AttractMode::update(float dt, Page &page)
         {
             elapsedTime_ = 0;
             isActive_ = false;
-            page.setScrolling(Page::ScrollDirectionIdle);
         }
     }
 }
+
+
+bool AttractMode::isActive()
+{
+    return isActive_;
+}
\ No newline at end of file
diff --git a/RetroFE/Source/Execute/AttractMode.h b/RetroFE/Source/Execute/AttractMode.h
index c016836..e398e53 100644
--- a/RetroFE/Source/Execute/AttractMode.h
+++ b/RetroFE/Source/Execute/AttractMode.h
@@ -24,6 +24,7 @@ public:
     void reset();
     void update(float dt, Page &page);
     float idleTime;
+    bool  isActive();
 
 private:
     bool isActive_;
diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 4c4fbbf..e4e9f70 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -724,7 +724,8 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
        !input_.keystate(UserInput::KeyCodeDown) &&
        !input_.keystate(UserInput::KeyCodeRight) &&
        !input_.keystate(UserInput::KeyCodePageUp) &&
-       !input_.keystate(UserInput::KeyCodePageDown))
+       !input_.keystate(UserInput::KeyCodePageDown) &&
+       !attract_.isActive())
     {
         if (page->isMenuScrolling())
             state = RETROFE_HIGHLIGHT_REQUEST;
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index e6005e0..81d0bbc 100644
--- a/RetroFE/Source/Version.cpp
+++ b/RetroFE/Source/Version.cpp
@@ -20,7 +20,7 @@
 
 std::string retrofe_version_major = "0";
 std::string retrofe_version_minor = "7";
-std::string retrofe_version_build = "5";
+std::string retrofe_version_build = "6";
 
 
 std::string Version::getString()