diff --git a/installer/wad/0001000154484246.tmd b/installer/wad/0001000154484246.tmd index 8af7b34..10817a9 100644 Binary files a/installer/wad/0001000154484246.tmd and b/installer/wad/0001000154484246.tmd differ diff --git a/source/BootHomebrew/BootHomebrew.cpp b/source/BootHomebrew/BootHomebrew.cpp index 785fc5a..cceacea 100644 --- a/source/BootHomebrew/BootHomebrew.cpp +++ b/source/BootHomebrew/BootHomebrew.cpp @@ -233,9 +233,9 @@ int BootHomebrew() if (!entry) return -1; -/* ExitApp(); + ExitApp(); - this will also be called when wiiloading an application + /*this will also be called when wiiloading an application will need to check if it's expected behavour? */ if(!wiiload_args) @@ -246,6 +246,8 @@ int BootHomebrew() Patch_ahbprot(); IOS_ReloadIOS(SelectedIOS()); } + else + IOS_ReloadIOS(SelectedIOS()); } wiiload_args = 0; diff --git a/source/main.cpp b/source/main.cpp index dc0a806..feab444 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -245,16 +245,21 @@ main(int argc, char *argv[]) } else if(boot_buffer) if(wiiload) + { + ExitApp(); BootHomebrew(); + } if(get_bootmii() == 2) { if(!check_uneek_fs()) { + ExitApp(); IOS_ReloadIOS(254); } else { + ExitApp(); //we can't launch bootmii from within neek2o I assume //so we should do something else SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); @@ -266,11 +271,13 @@ main(int argc, char *argv[]) if (opendir(check_path("sd1:/apps/NANDEmu-Boot").c_str()) != NULL) { LoadHomebrew ("sd1:/apps/NANDEmu-Boot/boot.dol"); + ExitApp(); BootHomebrew (); } else if (opendir(check_path("usb1:/apps/NANDEmu-Boot").c_str()) != NULL) { LoadHomebrew ("usb1:/apps/NANDEmu-Boot/boot.dol"); + ExitApp(); BootHomebrew (); } } @@ -279,19 +286,19 @@ main(int argc, char *argv[]) { *(vu32*)0x8132FFFB = 0x4461636f; DCFlushRange((void*)0x8132FFFB, 4); - //ExitApp(); + ExitApp(); SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); } if(goneek2o) { - //ExitApp(); + ExitApp(); boot_neek2o(); } if(gorealnand) { - //ExitApp(); + ExitApp(); SYS_ResetSystem(SYS_RESTART, 0, 0); } @@ -299,11 +306,11 @@ main(int argc, char *argv[]) { *(vu32*)0x8132FFFB = 0x50756E65; DCFlushRange((void*)0x8132FFFB, 4); - //ExitApp(); + ExitApp(); SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); } else if(PowerOff != -1) - //ExitApp(); + ExitApp(); SYS_ResetSystem(PowerOff, 0, 0); return 0; diff --git a/updates b/updates index f4d7018..e068689 100644 --- a/updates +++ b/updates @@ -4,9 +4,13 @@ * erase button is hidden for apps from DVD * edit button no longer overlaps SD/USB/DVD icon (if any) - BUGFIX: childlock is now saved when HBF exits +- BUGFIX: call ExitApp() before exiting HBF - BUGFIX: installer no longer crashes on IOS58 due to early controller initialization (only happened under certain circumstances) +- BUGFIX: ... seems the issue where WiiMC is the only application + that does not see the USB HDD is fixed (only happened + under certain circumstances) - BUGFIX: compiled with libpng 1.4 to fix a problem in PNG handling - BUGFIX: return to HBF feature now works again - installer now supports Classic-Controller