From 8fa8428d42b1f4a33e2ee594c8cb8728b86dc8c5 Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 27 May 2008 03:15:30 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=80=E3=82=A4=E3=83=AC=E3=82=AF=E3=83=88?=
 =?UTF-8?q?=E3=83=96=E3=83=BC=E3=83=88=E3=81=AE=E6=99=82=E3=81=AB=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=B3=E3=83=88=E3=83=AD=E3=83=BC=E3=83=89=E3=81=AE?=
 =?UTF-8?q?=E7=B5=82=E4=BA=86=E5=BE=85=E3=81=A1=E3=81=8C=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=9F?=
 =?UTF-8?q?=E3=82=81=E3=80=81=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC?=
 =?UTF-8?q?=E9=9D=9E=E8=A1=A8=E7=A4=BA=E7=89=88=E3=81=A7=20=E6=9C=AC?=
 =?UTF-8?q?=E4=BD=93=E8=A8=AD=E5=AE=9A=E3=81=8C=E8=B5=B7=E5=8B=95=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E4=B8=8D=E5=85=B7?=
 =?UTF-8?q?=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3=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/branches/20080524_SDK500fc_plus3_branch@1532 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_RED/Launcher/ARM9/src/main.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c
index a011aaaa..a280caf0 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/main.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c
@@ -193,9 +193,11 @@ void TwlMain( void )
     if( !pBootTitle ||
         ( pBootTitle && !SYSM_IsLogoDemoSkip() ) ) {
 		u32 timestamp;
+#if 0
 		if( !LoadSharedFontInit() ) {				// 共有フォントのロード
 			SYSM_SetFatalError( TRUE );
 		}
+#endif
 		timestamp = OS_GetSharedFontTimestamp();
 		if( timestamp > 0 ) OS_TPrintf( "SharedFont timestamp : %08x\n", timestamp );
 	}
@@ -301,11 +303,12 @@ void TwlMain( void )
             }
             break;
         case LOAD_START:
-            SYSM_StartLoadTitle( pBootTitle );
-            state = LOADING;
-
-            start = OS_GetTick();
+			if( IsFinishedLoadSharedFont() ) {		// ダイレクトブートの時があるので、フォントロード終了をここでチェック
+	            SYSM_StartLoadTitle( pBootTitle );
+    	        state = LOADING;
 
+    	        start = OS_GetTick();
+			}
             break;
         case LOADING:
             if( SYSM_IsLoadTitleFinished() ) {