*Some fixes for those who were having troubles with the new revs

This commit is contained in:
dimok321 2010-01-07 08:35:11 +00:00
parent 205d5ee579
commit 604ecb7b79
7 changed files with 34 additions and 15 deletions

View File

@ -2,8 +2,8 @@
<app version="1">
<name> USB Loader GX</name>
<coder>USB Loader GX Team</coder>
<version>1.0 r885</version>
<release_date>201001062311</release_date>
<version>1.0 r886</version>
<release_date>201001070832</release_date>
<short_description>Loads games from USB-devices</short_description>
<long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times.
The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller.

File diff suppressed because one or more lines are too long

View File

@ -144,7 +144,7 @@ int main(int argc, char *argv[])
printf("\n\tInitialize USB (wake up)");
USBDevice_Init();// seems enough to wake up some HDDs if they are in sleep mode when the loader starts (tested with WD MyPassport Essential 2.5")
USBDevice_deInit();
USBDevice_deInit();// seems enough to wake up some HDDs if they are in sleep mode when the loader starts (tested with WD MyPassport Essential 2.5")
ret = CheckForCIOS();
@ -166,6 +166,18 @@ int main(int argc, char *argv[])
printf("\n\tConfiguration file is on %s", bootDevice);
}
// Try opening and closing the configuration file here
// to prevent a crash dump later on - giantpune
// how the fuck is this supposed to help? - dimok
char GXGlobal_cfg[26];
sprintf(GXGlobal_cfg, "%s/config/GXGlobal.cfg", bootDevice);
FILE *fp = fopen(GXGlobal_cfg, "r");
if (fp)
{
fclose(fp);
printf("\n\tConfiguration file is on %s", bootDevice);
}
gettextCleanUp();
printf("\n\tLoading configuration...");
CFG_Load();

View File

@ -325,6 +325,8 @@ int MainMenu(int menu) {
CloseXMLDatabase();
NewTitles::DestroyInstance();
if (strcmp(headlessID,"")!=0)//the GUIthread was never started, so it cant be ended and joined properly if headless mode was used. so we resume it and close it.
ResumeGui();
ExitGUIThreads();
bgMusic->Stop();

View File

@ -111,7 +111,7 @@ int CheckPartition()
}
if (ret2 < 0 && load_from_fs != PART_FS_WBFS)
return ret2;
return -1;
ret2 = Disc_Init();
if (ret2 < 0)
@ -121,6 +121,8 @@ int CheckPartition()
if(isInserted(bootDevice))
OpenXMLDatabase(Settings.titlestxt_path,Settings.db_language, Settings.db_JPtoEN, true, Settings.titlesOverride==1?true:false, true);
__Menu_GetEntries(0);
hddState = 1;
return hddState;

View File

@ -338,9 +338,11 @@ s32 CheckForCIOS()
}
else
{
SDCard_Init();
//only for 222 loading ehc modules
printf("\n\tLoad ehc module");
load_ehc_module();
SDCard_deInit();
}
}

View File

@ -408,14 +408,14 @@ int buildTitleList(int t, wchar_t* gameFilter, discHdr ** PgameList, u32 *PgameC
continue;
}*/
/*if(gameFilter && *gameFilter) {
if(gameFilter && *gameFilter) {
u32 filter_len = wcslen(gameFilter);
wchar_t *gameName = FreeTypeGX::charToWideChar(get_title(header));
if (!gameName || wcsnicmp(gameName, gameFilter, filter_len)) {
delete [] gameName;
continue;
}
}*/
}
if(i != cnt2)
buffer[cnt2] = buffer[i];
cnt2++;
@ -586,7 +586,8 @@ int __Menu_GetEntries(int t, const wchar_t* Filter) {
for(;;)
{
if (mountMethod==3)
{int butt =buildTitleList(t, new_gameFilter, &new_gameList, &new_gameCnt);
{
int butt =buildTitleList(t, new_gameFilter, &new_gameList, &new_gameCnt);
if (butt < 0)
{
gprintf("\nbutt:%d", butt);