From ee4e3e02b8e25320ffb8e752a27e4a3c2e02a87e Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 27 Nov 2013 07:32:42 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4=E5=89=8D=E3=81=AE=E3=83=A1=E3=83=83=E3=82=BB?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=82=92=E3=82=AA=E3=83=AC=E3=83=B3=E3=82=B8?=
 =?UTF-8?q?=E8=89=B2=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82=E3=82=A2=E3=82=AB?=
 =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=83=88=E5=89=8A=E9=99=A4=E9=96=8B=E5=A7=8B?=
 =?UTF-8?q?=E3=82=92Y=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AB=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@769 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/ConsoleRestore.cpp          |  4 +++-
 .../sources/ConsoleRestore/Controller.cpp              | 10 +++++-----
 .../sources/ConsoleRestore/Controller.h                |  3 ++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
index 8a0cfa3..23e577c 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
@@ -189,6 +189,7 @@ extern "C" void nnMain(void)
         bool nextStep = false;
         bool operateBmsDone = false;
         bool forcePreinstall = false;
+        bool unregister = false;
 
         s_PadReader.ReadLatest(&padStatus);
 
@@ -204,6 +205,7 @@ extern "C" void nnMain(void)
         {
             operateBmsDone = true;
             forcePreinstall = true;
+            unregister = true;
         }
 
         // LまたはRボタンで上下画面フリップ
@@ -258,7 +260,7 @@ extern "C" void nnMain(void)
         }
         else
         {
-            ControlState(manager, operationMessage, nextStep, operateBmsDone, forcePreinstall);
+            ControlState(manager, operationMessage, nextStep, operateBmsDone, forcePreinstall, unregister);
 
             nn::util::FloatColor titleColor;
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index e58b916..6df956c 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -865,7 +865,7 @@ nn::Result ExecSyncMcuRtc(common::HardwareStateManager& manager)
 } // namespace <unnamed>
 
 void ControlState(common::HardwareStateManager& manager, common::OperationMessage& operationMessage, bool& nextStep,
-        bool operateBmsDone, bool forcePreinstall)
+        bool operateBmsDone, bool forcePreinstall, bool unregister)
 {
     using namespace common;
     nn::Result result;
@@ -1134,11 +1134,11 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag
 
         case WAIT_START_DELETE_ACCOUNT:
         {
-            operationMessage.Add("Push A or START Button");
-            operationMessage.Add("Delete Account Mode");
+            operationMessage.Add("Delete Account Mode.", nn::util::Color8(255, 153, 0, 255));
+            operationMessage.Add("Press Y Button to Continue");
             PlayCursorSound(WAIT_START_DELETE_ACCOUNT);
 
-            if (nextStep)
+            if (unregister)
             {
                 COMMON_LOGGER("Delete Account\n");
                 s_RestoreState = DELETE_ACCOUNT;
@@ -1690,7 +1690,7 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag
         case PREINSTALL_WAIT_START_UPDATE:
         {
             operationMessage.Add("Operate BMS to Transfer PreInstalled Application", nn::util::Color8(0, 255, 255, 255));
-            operationMessage.Add("and NNAS management Tool.", nn::util::Color8(0, 255, 255, 255));            
+            operationMessage.Add("and NNAS management Tool.", nn::util::Color8(0, 255, 255, 255));
             operationMessage.Add("Press Y Button to Continue.");
             PlayCursorSound(PREINSTALL_WAIT_START_UPDATE);
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h
index 5499d67..58d82f6 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.h
@@ -44,8 +44,9 @@ const u32 RETRY_MAX = 3;
 // nextStep 次の状態に遷移してもよいかどうか
 // operateBmsDone BMS操作を完了したかどうか
 // forcePreinstall ユーザSDが初期化済みだが、プリインストールアプリを書き込むかどうか
+// unregister アカウント削除を開始しても良いか
 void ControlState(common::HardwareStateManager& manager, common::OperationMessage& operationMessage, bool& nextStep,
-        bool operateBmsDone, bool forcePreinstall);
+        bool operateBmsDone, bool forcePreinstall, bool unregister);
 
 // リストア処理中かどうか
 bool InProgress();