From 124ffddbe2a48d0c02ce7c92c3265eea7568e302 Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 10 Apr 2008 12:19:41 +0000
Subject: [PATCH] =?UTF-8?q?MachineSettings=E3=81=AB=E3=83=9A=E3=82=A2?=
 =?UTF-8?q?=E3=83=AC=E3=83=B3=E3=82=BF=E3=83=AB=E3=82=B3=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=AB=E8=A8=AD=E5=AE=9A=E6=B8=88=E3=81=BF?=
 =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=B0=E3=82=92=E3=82=BB=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=80=81=E3=82=84=E3=81=A3=E3=81=A4=E3=81=91?=
 =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0=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@1104 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../MachineSettings/ARM9/src/MachineSetting.h        |  2 +-
 .../MachineSettings/ARM9/src/setParentalControl.c    | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.h b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.h
index 52b79543..ea15e170 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.h
+++ b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.h
@@ -35,7 +35,7 @@ extern "C" {
 #define HANDLE_OK_BUTTON					255
 #define HANDLE_CANCEL_BUTTON				256
 
-#define BROADON_ENABLE                                            // BroadOn用に設定項目を切り替える
+//#define BROADON_ENABLE                                            // BroadOn用に設定項目を切り替える
 
 // 数値入力インターフェース用ワーク（void InputDecimal()で使用）
 typedef struct InputNumParam {
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/setParentalControl.c b/build/systemMenu_RED/MachineSettings/ARM9/src/setParentalControl.c
index 0427d26f..7f417350 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/src/setParentalControl.c
+++ b/build/systemMenu_RED/MachineSettings/ARM9/src/setParentalControl.c
@@ -997,7 +997,17 @@ static void SetDrawnPageElement( void )
 // 初期化
 void SetParentalControlInit( void )
 {
-    // ページの初期化
+	// ペアレンタルコントロール設定前なら、とりあえず問答無用でペアレンタルコントロール設定フラグを立てる
+	if( !LCFG_TSD_IsSetParentalControl() ) {
+		OS_TPrintf( "First ParentalControl... set flag.\n" );
+		LCFG_TSD_SetFlagParentalControl( TRUE );
+        if( !MY_WriteTWLSettings() )
+        {
+            OS_TPrintf( "TWL settings write failed.\n" );
+        }
+	}
+	
+	// ページの初期化
     if( sbInitPage )            // 特別にFALSEが指定されたときだけページをそのままにする
     {
         sCurrentPage = 0;