fix the screensaver coming on when you press power on the wiimote... again.

added check for GXglobal.cfg on the USB at startup.  now if anny of the following are met, it will cause USB to be used as your bootDevice:

argv[0] gets passed on startup and it is usb

any of these files are on your USB drive.
USB:/config/GXglobal.cfg || USB:/apps/usbloader_gx/boot.elf || USB:/apps/usbloadergx/boot.dol || USB:/apps/usbloadergx/boot.elf || USB:/apps/usbloader_gx/boot.dol
This commit is contained in:
giantpune 2009-07-28 17:22:03 +00:00
parent 2039a47250
commit 8ed332bde7
4 changed files with 8 additions and 6 deletions

File diff suppressed because one or more lines are too long

View File

@ -72,8 +72,10 @@ main(int argc, char *argv[])
if(!bootDevice_found) if(!bootDevice_found)
{ {
//try USB //try USB
if(checkfile((char*) "USB:/apps/usbloader_gx/boot.dol") || (checkfile((char*) "USB:/apps/usbloader_gx/boot.elf")) //left in all the dol and elf files in this check in case this is the first time running the app and they dont have the config
|| checkfile((char*) "USB:/apps/usbloadergx/boot.dol") || (checkfile((char*) "USB:/apps/usbloadergx/boot.elf"))) if(checkfile((char*) "USB:/config/GXglobal.cfg") || (checkfile((char*) "USB:/apps/usbloader_gx/boot.elf"))
|| checkfile((char*) "USB:/apps/usbloadergx/boot.dol") || (checkfile((char*) "USB:/apps/usbloadergx/boot.elf"))
|| checkfile((char*) "USB:/apps/usbloader_gx/boot.dol"))
strcpy(bootDevice, "USB:"); strcpy(bootDevice, "USB:");
} }

View File

@ -1360,8 +1360,8 @@ int MenuDiscList()
if(!IsWpadConnected() && check !=0 && Settings.screensaver!=0) if(!IsWpadConnected() && check !=0 && Settings.screensaver!=0)
{ check++; { check++;
int screensaverIsOn=0; int screensaverIsOn=0;
if(check==100) //to allow time for the wii to turn off and not show the screensaver if(check==11500) //to allow time for the wii to turn off and not show the screensaver
screensaverIsOn=WindowScreensaver(); {screensaverIsOn=WindowScreensaver();}
if (screensaverIsOn==1)check=0; if (screensaverIsOn==1)check=0;
} }
covertOld=covert; covertOld=covert;

View File

@ -1,4 +1,4 @@
#define SVN_REV "661:662M" #define SVN_REV "664M"
const char *GetRev() const char *GetRev()
{ {