diff --git a/source/channel/channels.cpp b/source/channel/channels.cpp index 882b0e78..352c3e1a 100644 --- a/source/channel/channels.cpp +++ b/source/channel/channels.cpp @@ -137,7 +137,7 @@ void Channels::GetBanner(u64 title, bool imetOnly) u32 cid; if(!GetAppNameFromTmd(title, app, false, &cid)) { - gprintf("No title found\n"); + gprintf("No title found for %08x %08x\n", (u32)(title&0xFFFFFFFF),(u32)(title>>32)); return; } CurrentBanner.GetBanner(title, app, true, imetOnly); diff --git a/source/loader/sys.c b/source/loader/sys.c index 6af12058..b7eee29a 100644 --- a/source/loader/sys.c +++ b/source/loader/sys.c @@ -112,6 +112,7 @@ void Sys_Exit(void) IOS_ReloadIOS(0xfe); else if(ExitOption == EXIT_TO_HBC) { + WII_LaunchTitle(HBC_LULZ); WII_LaunchTitle(HBC_108); WII_LaunchTitle(HBC_JODI); WII_LaunchTitle(HBC_HAXX); diff --git a/source/loader/sys.h b/source/loader/sys.h index c3bea498..bfbf93d7 100644 --- a/source/loader/sys.h +++ b/source/loader/sys.h @@ -8,6 +8,7 @@ extern "C" { #endif /* __cplusplus */ +#define HBC_LULZ 0x000100014c554c5aULL #define HBC_108 0x00010001af1bf516ULL #define HBC_JODI 0x0001000148415858ULL #define HBC_HAXX 0x000100014a4f4449ULL @@ -25,6 +26,7 @@ enum EXIT_TO_WFNK2O, EXIT_TO_SMNK2O, BUTTON_CALLBACK, + WIIFLOW_DEF, }; /* Prototypes */ diff --git a/source/menu/menu_home.cpp b/source/menu/menu_home.cpp index 0fb63cfc..78491431 100644 --- a/source/menu/menu_home.cpp +++ b/source/menu/menu_home.cpp @@ -92,7 +92,7 @@ bool CMenu::_Home(void) { _hideHome(); if(m_locked) - exitHandler(PRIILOADER_DEF); + exitHandler(WIIFLOW_DEF); else _ExitTo(); if(m_exit) @@ -102,7 +102,7 @@ bool CMenu::_Home(void) } else if(BTN_HOME_PRESSED) { - exitHandler(PRIILOADER_DEF); + exitHandler(WIIFLOW_DEF); break; } else if(BTN_B_PRESSED) @@ -163,7 +163,7 @@ bool CMenu::_ExitTo(void) } else if(BTN_HOME_PRESSED) { - exitHandler(PRIILOADER_DEF); + exitHandler(WIIFLOW_DEF); break; } else if(BTN_B_PRESSED) diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp index 440668ba..792957e4 100644 --- a/source/menu/menu_main.cpp +++ b/source/menu/menu_main.cpp @@ -215,7 +215,8 @@ void CMenu::exitHandler(int ExitTo) stat("sd:/bootmii/ppcboot.elf", &dummy) != 0) ExitTo = EXIT_TO_HBC; } - Sys_ExitTo(ExitTo); + if(ExitTo != WIIFLOW_DEF) + Sys_ExitTo(ExitTo); } int CMenu::main(void)