From 32b51b697143ea4ff0a1fc32b07a20555e37eb52 Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 28 Jul 2008 04:45:22 +0000
Subject: [PATCH] =?UTF-8?q?UIG=E3=81=8B=E3=82=89=E3=81=AE=E8=A6=81?=
 =?UTF-8?q?=E6=9C=9B=E3=81=AB=E3=82=88=E3=82=8A=E3=80=81=E3=83=96=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=81=AE=E5=84=AA=E5=85=88=E9=A0=86=E4=BD=8D=E3=82=92?=
 =?UTF-8?q?=E3=80=8C=E3=83=95=E3=83=A9=E3=83=83=E3=82=B7=E3=83=A5=E5=A3=8A?=
 =?UTF-8?q?=E3=82=8C=E3=82=B7=E3=83=BC=E3=82=B1=E3=83=B3=E3=82=B9=E3=80=8D?=
 =?UTF-8?q?=E2=86=92=E3=80=8CTP=E8=B5=B7=E5=8B=95=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=82=AB=E3=83=83=E3=83=88=E3=80=8D=E2=86=92?=
 =?UTF-8?q?=20=E3=80=8C=E5=88=9D=E5=9B=9E=E8=B5=B7=E5=8B=95=E3=82=B7?=
 =?UTF-8?q?=E3=83=BC=E3=82=B1=E3=83=B3=E3=82=B9=E3=80=8D=E3=81=AE=E9=A0=86?=
 =?UTF-8?q?=E3=81=AB=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/branches/20080724_SDK500rc_branch@2010 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../sysmenu/ARM9/src/sysmenu_lib.c            | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
index 7b35a7e1..efbb0f6f 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
@@ -468,18 +468,8 @@ static TitleProperty *SYSMi_CheckShortcutBoot2( void )
 		argument      = 100;		// フラッシュ壊れシーケンス起動
 		isSetArgument = TRUE;
 		isBootMSET    = TRUE;
-	}
-	
-    //-----------------------------------------------------
-    // TWL設定データ未設定時の初回起動シーケンス起動
-    //-----------------------------------------------------
-    else if( !LCFG_TSD_IsFinishedInitialSetting() ) {
-		argument      = 0;
-		isSetArgument = FALSE;
-		isBootMSET    = TRUE;
     }else 
 #endif
-	
     //-----------------------------------------------------
     // L+R+Startボタン押下起動で、本体設定のタッチパネル設定を起動
     //-----------------------------------------------------
@@ -489,7 +479,17 @@ static TitleProperty *SYSMi_CheckShortcutBoot2( void )
 		isSetArgument = TRUE;
 		isBootMSET    = TRUE;
     }
-
+#ifndef DISABLE_INITIAL_SETTINGS
+    //-----------------------------------------------------
+    // TWL設定データ未設定時の初回起動シーケンス起動
+    //-----------------------------------------------------
+    else if( !LCFG_TSD_IsFinishedInitialSetting() ) {
+		argument      = 0;
+		isSetArgument = FALSE;
+		isBootMSET    = TRUE;
+    }
+#endif
+	
     //-----------------------------------------------------
     // ランチャー画面を表示しないバージョンの場合
     // カードがささっていたらカードを起動する