From 979411e0858120339cc9569423dd2d6c5755cf4e Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 16 Jan 2008 12:25:24 +0000
Subject: [PATCH] =?UTF-8?q?IS=E3=83=87=E3=83=90=E3=83=83=E3=82=AC=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=81=AE=E6=A4=9C=E8=A8=BC=E7=94=A8=E3=81=A8=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=80=81=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC?=
 =?UTF-8?q?=E3=81=A7=E3=83=80=E3=82=A4=E3=83=AC=E3=82=AF=E3=83=88=E3=83=96?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E6=99=82=E3=81=AB=E3=83=AD=E3=82=B4=E3=83=87?=
 =?UTF-8?q?=E3=83=A2=E3=82=92=E6=9C=89=E5=8A=B9=E3=81=AB=E5=87=BA=E6=9D=A5?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E5=A4=89=E6=9B=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@478 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_RED/Launcher/ARM9/Makefile   |  2 +-
 build/systemMenu_RED/Launcher/ARM9/src/main.c | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

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: