From ad0abe779e92f67bc981a571f352446c9f1e1982 Mon Sep 17 00:00:00 2001
From: Don Honerbrink <dhonerbrink@gmail.com>
Date: Tue, 3 Feb 2015 16:29:05 -0600
Subject: [PATCH] Changed menu tween precidence

---
 RetroFE/Source/Graphics/Component/Component.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/RetroFE/Source/Graphics/Component/Component.cpp b/RetroFE/Source/Graphics/Component/Component.cpp
index a722473..ab92623 100644
--- a/RetroFE/Source/Graphics/Component/Component.cpp
+++ b/RetroFE/Source/Graphics/Component/Component.cpp
@@ -201,6 +201,12 @@ void Component::Update(float dt)
                EnterRequested = false;
                NewItemSelected = false;
             }
+            else if(MenuExitRequested)
+            {
+                MenuExitRequested = false;
+                CurrentTweens = Tweens->GetTween("menuExit", MenuExitIndex);
+                CurrentAnimationState = MENU_EXIT;
+            }
             else if(MenuEnterRequested)
             {
                 MenuEnterRequested = false;
@@ -213,12 +219,6 @@ void Component::Update(float dt)
                 CurrentTweens = Tweens->GetTween("menuScroll", MenuEnterIndex);
                 CurrentAnimationState = MENU_SCROLL;
             }
-            else if(MenuExitRequested)
-            {
-                MenuExitRequested = false;
-                CurrentTweens = Tweens->GetTween("menuExit", MenuExitIndex);
-                CurrentAnimationState = MENU_EXIT;
-            }
             else if(IsScrollActive() || NewItemSelected || ExitRequested)
             {
                 CurrentTweens = Tweens->GetTween("highlightExit", MenuEnterIndex);