From 8c4c3f24182c4d0995f4f4aa9fc8b2e374e070d8 Mon Sep 17 00:00:00 2001
From: "wagic.jeck" <wagic.jeck@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Tue, 20 Oct 2009 04:33:43 +0000
Subject: [PATCH] Jeck - Final fix to r1109. It was reloading the old options
 halfway through saving the new ones.

---
 projects/mtg/src/GameStateOptions.cpp | 11 ++++++-----
 projects/mtg/src/OptionItem.cpp       |  5 ++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/projects/mtg/src/GameStateOptions.cpp b/projects/mtg/src/GameStateOptions.cpp
index a2c523da0..98545f4cc 100644
--- a/projects/mtg/src/GameStateOptions.cpp
+++ b/projects/mtg/src/GameStateOptions.cpp
@@ -116,6 +116,12 @@ void GameStateOptions::Update(float dt)
       optionsMenu->Update(dt);
     break;
   }
+  
+  if(mReload){
+    options.reloadProfile(false);
+    optionsTabs->Reload();    
+    mReload = false;
+  }
 }
 
 void GameStateOptions::Render()
@@ -163,11 +169,6 @@ void GameStateOptions::Render()
 
   optionsTabs->Render();
 
-  if(mReload){
-    optionsTabs->Reload();
-    mReload = false;
-  }
-
   if(mState == SHOW_OPTIONS_MENU)    
       optionsMenu->Render();
 
diff --git a/projects/mtg/src/OptionItem.cpp b/projects/mtg/src/OptionItem.cpp
index c570c8b87..d09a07334 100644
--- a/projects/mtg/src/OptionItem.cpp
+++ b/projects/mtg/src/OptionItem.cpp
@@ -201,6 +201,7 @@ void OptionProfile::Reload(){
   populate();
 }
 void OptionProfile::populate(){ 
+
  string temp = options[Options::ACTIVE_PROFILE].str;
  if (value >= selections.size()){ //TODO fail gracefully.
    return;
@@ -266,14 +267,12 @@ void OptionProfile::confirmChange(bool confirmed){
 
   int result;
 
-  if(confirmed)      
-    result = value;
+  if(confirmed)      result = value;
   else               result = initialValue;
 
   options[Options::ACTIVE_PROFILE] = selections[result];
   value = result;
 
-  options.reloadProfile(false);
   populate(); 
   if(listener && confirmed)
     listener->ButtonPressed(-102,5);