From 8750eb2851715ffc35a30f6a0c2523a414ab29db Mon Sep 17 00:00:00 2001
From: dimok321 <15055714+dimok789@users.noreply.github.com>
Date: Sun, 14 Jun 2009 20:43:58 +0000
Subject: [PATCH] *Fixed some BUGs

---
 source/menu.cpp              | 19 ++++++++++++++-----
 source/settings/Settings.cpp | 18 +++++++++---------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/source/menu.cpp b/source/menu.cpp
index 1986db0c..e11894bf 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -867,7 +867,10 @@ static int MenuDiscList()
                                 */
                                 Settings.gameDisplay=list;
                                 menu = MENU_DISCLIST;
-                listBtn.ResetState();
+                                if(isInserted(bootDevice)) {
+                                cfg_save_global();
+                                }
+                                listBtn.ResetState();
                                 break;
                 } else {
                                 /*gameBrowser.Reload(gameList, gameCnt); // initialize before append
@@ -939,7 +942,10 @@ static int MenuDiscList()
                                 */
                                 Settings.gameDisplay=grid;
                                 menu = MENU_DISCLIST;
-                gridBtn.ResetState();
+                                if(isInserted(bootDevice)) {
+                                cfg_save_global();
+                                }
+                                gridBtn.ResetState();
                                 break;
                         } else {
                                 /*
@@ -1007,7 +1013,10 @@ static int MenuDiscList()
                                 */
                                 Settings.gameDisplay=carousel;
                                 menu = MENU_DISCLIST;
-                carouselBtn.ResetState();
+                                if(isInserted(bootDevice)) {
+                                cfg_save_global();
+                                }
+                                carouselBtn.ResetState();
                                 break;
                 } else {
                                 /*
@@ -1411,15 +1420,14 @@ static int MenuInstall()
 			sprintf(errortxt, "%s: %.2fGB, %s: %.2fGB",LANGUAGE.GameSize, gamesize, LANGUAGE.FreeSpace, freespace);
 			choice = WindowPrompt(LANGUAGE.Notenoughfreespace,errortxt,LANGUAGE.ok, LANGUAGE.Return,0,0);
 			if (choice == 1) {
-			    wiilight(1);
 				ret = ProgressWindow(gametxt, name);
+                wiilight(0);
 				if (ret != 0) {
 					WindowPrompt (LANGUAGE.Installerror,0,LANGUAGE.Back,0,0,0);
 					menu = MENU_DISCLIST;
 					break;
 				}
 				else {
-				    wiilight(1);
 					__Menu_GetEntries(); //get the entries again
 					WindowPrompt (LANGUAGE.Successfullyinstalled,name,LANGUAGE.ok,0,0,0);
 					menu = MENU_DISCLIST;
@@ -1433,6 +1441,7 @@ static int MenuInstall()
 		}
 		else {
 			ret = ProgressWindow(gametxt, name);
+            wiilight(0);
 			if (ret != 0) {
 				WindowPrompt (LANGUAGE.Installerror,0,LANGUAGE.Back,0,0,0);
 				menu = MENU_DISCLIST;
diff --git a/source/settings/Settings.cpp b/source/settings/Settings.cpp
index e5443974..cdc07f71 100644
--- a/source/settings/Settings.cpp
+++ b/source/settings/Settings.cpp
@@ -744,8 +744,8 @@ int MenuSettings()
                             Settings.cios = 0;
                         if ( Settings.language >= settings_language_max)
                             Settings.language = 0;
-                        if(Settings.ocarina >= settings_off_on_max)
-                            Settings.ocarina = 0;
+                        if(Settings.error002 >= settings_off_on_max)
+                            Settings.error002 = 0;
 
                         if (Settings.video == discdefault) options2.SetValue(0,"%s",LANGUAGE.DiscDefault);
                         else if (Settings.video == systemdefault) options2.SetValue(0,"%s",LANGUAGE.SystemDefault);
@@ -907,7 +907,7 @@ int MenuSettings()
                         else options2.SetValue(1, Settings.unlockCode);
 
                         if (Settings.godmode != 1) options2.SetValue(2, "********");
-                        else if(Settings.parentalcontrol == 0) options2.SetValue(2, LANGUAGE.Everyone);
+                        else if(Settings.parentalcontrol == 0) options2.SetValue(2, LANGUAGE.OFF);
                         else if(Settings.parentalcontrol == 1) options2.SetValue(2, LANGUAGE.Child);
                         else if(Settings.parentalcontrol == 2) options2.SetValue(2, LANGUAGE.Teen);
                         else if(Settings.parentalcontrol == 3) options2.SetValue(2, LANGUAGE.Mature);
@@ -1891,13 +1891,13 @@ int GameSettings(struct discHdr * header)
             case 9:
                 int choice = WindowPrompt(LANGUAGE.Areyousure,0,LANGUAGE.Yes,LANGUAGE.Cancel,0,0);
                 if(choice == 1) {
-                    videoChoice = discdefault;
-                    viChoice = off;
-                    languageChoice = ConsoleLangDefault;
-                    ocarinaChoice = off;
-                    fix002 = off;
+                    videoChoice = Settings.video;
+                    viChoice = Settings.vpatch;
+                    languageChoice = Settings.language;
+                    ocarinaChoice = Settings.ocarina;
+                    fix002 = Settings.error002;
                     onlinefix = off;
-                    countrystrings = off;
+                    countrystrings = Settings.patchcountrystrings;
                     if(Settings.cios == ios222) {
                         iosChoice = i222;
                     } else {