diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index 6451ac20..9f09f690 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -17,12 +17,12 @@ #---------------------------------------------------------------------------- SUBDIRS = \ + ../../../libraries_sysmenu/hotsw \ ../../../libraries_sysmenu/sysmenu \ ../../../components/hyena.TWL # ../../../libraries_sysmenu/reloc_info \ # ../../../libraries_sysmenu/settings \ # ../../../libraries_sysmenu/boot \ -# ../../../libraries_sysmenu/hotsw \ #---------------------------------------------------------------------------- diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c index a7a4e345..4c8feca1 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/main.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c @@ -117,7 +117,11 @@ void TwlMain( void ) if( pBootTitle ) { // ダイレクトブートなら、ロゴ、ランチャーを飛ばしてロード開始 - state = LOAD_START; + if( pBootTitle->flags.isLogoSkip ) { + state = LOAD_START; + }else { + state = LOGODEMO_INIT; + } direct_boot = TRUE; }else if( SYSM_IsLogoDemoSkip() ) { // ロゴデモスキップが指定されていたら、ランチャー起動 @@ -162,7 +166,11 @@ void TwlMain( void ) break; case LOGODEMO: if( LogoMain() ) { - state = LAUNCHER_INIT; + if( !direct_boot ) { + state = LAUNCHER_INIT; + }else { + state = LOAD_START; + } } break; case LAUNCHER_INIT: