From db96cb514260431f4a4225bedecfc60f6bb0be9e Mon Sep 17 00:00:00 2001
From: "jean.chalard" <jean.chalard@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Wed, 5 May 2010 06:27:52 +0000
Subject: [PATCH] J : * Partial fix for issue 380. * This remove a bug where a
 variable was not initialized in profiles. * The impact on this could have
 ranged all the way to a full trashing   of the user configuration files
 (though it requires some bad luck)

---
 projects/mtg/include/OptionItem.h |  5 +++--
 projects/mtg/src/OptionItem.cpp   | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/projects/mtg/include/OptionItem.h b/projects/mtg/include/OptionItem.h
index 5841b3410..ac57bb8cf 100644
--- a/projects/mtg/include/OptionItem.h
+++ b/projects/mtg/include/OptionItem.h
@@ -122,11 +122,12 @@ class OptionProfile:public OptionDirectory{
   virtual void Entering(JButton key);
   virtual void Reload();
   virtual void Render();
+  virtual void initSelections();
   virtual void confirmChange(bool confirmed);
   virtual void updateValue();
   void populate();
-private:  
-  GameApp * app;  
+private:
+  GameApp * app;
   JGuiListener * listener;
   bool canSelect;
   string preview;
diff --git a/projects/mtg/src/OptionItem.cpp b/projects/mtg/src/OptionItem.cpp
index 2bf734d3b..4e0d99c8d 100644
--- a/projects/mtg/src/OptionItem.cpp
+++ b/projects/mtg/src/OptionItem.cpp
@@ -56,10 +56,9 @@ void OptionInteger::setData(){
 //Option Select
 void OptionSelect::initSelections(){
   //Find currently active bit in the list.
-    for(size_t i=0;i<selections.size();i++){
-      if(selections[i] == options[id].str)
-        value = i;
-    }
+  for (size_t i = 0; i < selections.size(); ++i)
+    if (selections[i] == options[id].str)
+      value = i;
 }
 
 void OptionSelect::Entering(JButton key){
@@ -107,6 +106,11 @@ OptionProfile::OptionProfile(GameApp * _app, JGuiListener * jgl) : OptionDirecto
   populate();
 };
 
+void OptionProfile::initSelections() {
+  OptionSelect::initSelections();
+  initialValue = value;
+}
+
 void OptionProfile::addSelection(string s){
   OptionDirectory::addSelection(s);