The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-09-30 19:08:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

*Fixed some BUGs

Browse Source
This commit is contained in:
dimok321 2009-06-14 20:43:58 +00:00
parent 3cf77ae5f3
commit 8750eb2851
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/menu.cpp
View File

@ -867,6 +867,9 @@ static int MenuDiscList()
*/ */
Settings.gameDisplay=list; Settings.gameDisplay=list;
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
if(isInserted(bootDevice)) {
cfg_save_global();
}
listBtn.ResetState(); listBtn.ResetState();
break; break;
} else { } else {
@ -939,6 +942,9 @@ static int MenuDiscList()
*/ */
Settings.gameDisplay=grid; Settings.gameDisplay=grid;
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
if(isInserted(bootDevice)) {
cfg_save_global();
}
gridBtn.ResetState(); gridBtn.ResetState();
break; break;
} else { } else {
@ -1007,6 +1013,9 @@ static int MenuDiscList()
*/ */
Settings.gameDisplay=carousel; Settings.gameDisplay=carousel;
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
if(isInserted(bootDevice)) {
cfg_save_global();
}
carouselBtn.ResetState(); carouselBtn.ResetState();
break; break;
} else { } else {
@ -1411,15 +1420,14 @@ static int MenuInstall()
sprintf(errortxt, "%s: %.2fGB, %s: %.2fGB",LANGUAGE.GameSize, gamesize, LANGUAGE.FreeSpace, freespace); sprintf(errortxt, "%s: %.2fGB, %s: %.2fGB",LANGUAGE.GameSize, gamesize, LANGUAGE.FreeSpace, freespace);
choice = WindowPrompt(LANGUAGE.Notenoughfreespace,errortxt,LANGUAGE.ok, LANGUAGE.Return,0,0); choice = WindowPrompt(LANGUAGE.Notenoughfreespace,errortxt,LANGUAGE.ok, LANGUAGE.Return,0,0);
if (choice == 1) { if (choice == 1) {
wiilight(1);
ret = ProgressWindow(gametxt, name); ret = ProgressWindow(gametxt, name);
wiilight(0);
if (ret != 0) { if (ret != 0) {
WindowPrompt (LANGUAGE.Installerror,0,LANGUAGE.Back,0,0,0); WindowPrompt (LANGUAGE.Installerror,0,LANGUAGE.Back,0,0,0);
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
break; break;
} }
else { else {
wiilight(1);
__Menu_GetEntries(); //get the entries again __Menu_GetEntries(); //get the entries again
WindowPrompt (LANGUAGE.Successfullyinstalled,name,LANGUAGE.ok,0,0,0); WindowPrompt (LANGUAGE.Successfullyinstalled,name,LANGUAGE.ok,0,0,0);
menu = MENU_DISCLIST; menu = MENU_DISCLIST;
@ -1433,6 +1441,7 @@ static int MenuInstall()
} }
else { else {
ret = ProgressWindow(gametxt, name); ret = ProgressWindow(gametxt, name);
wiilight(0);
if (ret != 0) { if (ret != 0) {
WindowPrompt (LANGUAGE.Installerror,0,LANGUAGE.Back,0,0,0); WindowPrompt (LANGUAGE.Installerror,0,LANGUAGE.Back,0,0,0);
menu = MENU_DISCLIST; menu = MENU_DISCLIST;

18
source/settings/Settings.cpp
View File

@ -744,8 +744,8 @@ int MenuSettings()
Settings.cios = 0; Settings.cios = 0;
if ( Settings.language >= settings_language_max) if ( Settings.language >= settings_language_max)
Settings.language = 0; Settings.language = 0;
if(Settings.ocarina >= settings_off_on_max) if(Settings.error002 >= settings_off_on_max)
Settings.ocarina = 0; Settings.error002 = 0;
if (Settings.video == discdefault) options2.SetValue(0,"%s",LANGUAGE.DiscDefault); if (Settings.video == discdefault) options2.SetValue(0,"%s",LANGUAGE.DiscDefault);
else if (Settings.video == systemdefault) options2.SetValue(0,"%s",LANGUAGE.SystemDefault); else if (Settings.video == systemdefault) options2.SetValue(0,"%s",LANGUAGE.SystemDefault);
@ -907,7 +907,7 @@ int MenuSettings()
else options2.SetValue(1, Settings.unlockCode); else options2.SetValue(1, Settings.unlockCode);
if (Settings.godmode != 1) options2.SetValue(2, "********"); 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 == 1) options2.SetValue(2, LANGUAGE.Child);
else if(Settings.parentalcontrol == 2) options2.SetValue(2, LANGUAGE.Teen); else if(Settings.parentalcontrol == 2) options2.SetValue(2, LANGUAGE.Teen);
else if(Settings.parentalcontrol == 3) options2.SetValue(2, LANGUAGE.Mature); else if(Settings.parentalcontrol == 3) options2.SetValue(2, LANGUAGE.Mature);
@ -1891,13 +1891,13 @@ int GameSettings(struct discHdr * header)
case 9: case 9:
int choice = WindowPrompt(LANGUAGE.Areyousure,0,LANGUAGE.Yes,LANGUAGE.Cancel,0,0); int choice = WindowPrompt(LANGUAGE.Areyousure,0,LANGUAGE.Yes,LANGUAGE.Cancel,0,0);
if(choice == 1) { if(choice == 1) {
videoChoice = discdefault; videoChoice = Settings.video;
viChoice = off; viChoice = Settings.vpatch;
languageChoice = ConsoleLangDefault; languageChoice = Settings.language;
ocarinaChoice = off; ocarinaChoice = Settings.ocarina;
fix002 = off; fix002 = Settings.error002;
onlinefix = off; onlinefix = off;
countrystrings = off; countrystrings = Settings.patchcountrystrings;
if(Settings.cios == ios222) { if(Settings.cios == ios222) {
iosChoice = i222; iosChoice = i222;
} else { } else {