The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-12-23 10:21:55 +01: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

19
source/menu.cpp
View File

@ -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;

18
source/settings/Settings.cpp
View File

@ -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 {