From 6b939f7b9c42efca1f8182b1e2760d076758e09d Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Tue, 24 May 2011 12:04:12 +0000
Subject: [PATCH] =?UTF-8?q?IVS=E5=8F=96=E5=BE=97=E3=83=A2=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=81=A7=E3=83=A6=E3=83=BC=E3=82=B6=E3=81=AESD?=
 =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=82=92=E3=81=9B=E3=81=9A=E3=82=B7=E3=83=A3=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E3=83=80=E3=82=A6=E3=83=B3=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
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@273 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp     | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 1d3b1c2..b54c01d 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -111,6 +111,7 @@ typedef enum RestoreState
     TRANSFER_ACCOUNT_DONE, // アカウント転送完了
     DOWNLOAD_IVS, // インフラからIVSを取得する
     DOWNLOAD_IVS_DONE, // インフラからIVSを取得完了
+    DOWNLOAD_IVS_WAIT_NEXT, // IVS取得モードでキー入力待ち
     CHECK_IVS, // IVSとSDカードのセーブデータディレクトリの一致を確認
     CHECK_SD_DIRECTORY, // SDカードのIVS依存ディレクトリを探す
     CHECK_SD_DIRECTORY_SUCCESS, // SDカードのIVS依存ディレクトリチェック完了
@@ -133,7 +134,8 @@ typedef enum RestoreState
     DOWNLOAD_TWL, // TWLアプリ本体をダウンロードする
     WAIT_SD_EJECT, // SDカードぬき待ち
     ALL_DONE, // すべて完了
-    SHUTDOWN, //　シャットダウン中
+    SHUTDOWN, // シャットダウン
+    INITIALIZE_AND_SHUTDOWN, //　本体初期化後にシャットダウン中
     FAIL // 失敗
 } RestoreState;
 
@@ -227,11 +229,7 @@ void CheckNupExecuted(common::HardwareStateManager& manager, ::std::vector<std::
 {
     if (common::ExistsUpdateCheckedFile())
     {
-        if(s_GetIvsOnlyMode)
-        {
-            CheckDownloadIvs(manager, message, goNextStep);
-        }
-        else if (s_NupOnlyMode)
+        if (s_NupOnlyMode)
         {
             s_RestoreState = DELETE_ACCOUNT;
         }
@@ -276,7 +274,7 @@ void CheckDownloadIvs(common::HardwareStateManager& manager, ::std::vector<std::
     {
         if(s_GetIvsOnlyMode)
         {
-            s_RestoreState = CHECK_IVS;
+            s_RestoreState = DOWNLOAD_IVS_WAIT_NEXT;
         }
         else
         {
@@ -1427,9 +1425,9 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
         }
         break;
 
-        case NUP_ONLY_WAIT_NEXT:
+        case DOWNLOAD_IVS_WAIT_NEXT:
         {
-            operationMessage.push_back(::std::string("A or START Button to Shutdown."));
+            operationMessage.push_back(::std::string("Press A or START Button to Shutdown."));
 
             if (nextStep)
             {
@@ -1438,7 +1436,24 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
         }
         break;
 
+        case NUP_ONLY_WAIT_NEXT:
+        {
+            operationMessage.push_back(::std::string("Press A or START Button to Shutdown."));
+
+            if (nextStep)
+            {
+                s_RestoreState = INITIALIZE_AND_SHUTDOWN;
+            }
+        }
+        break;
+
         case SHUTDOWN:
+        {
+            nn::ptm::CTR::ShutdownAsync(0, nn::fnd::TimeSpan::FromSeconds(0));
+        }
+        break;
+
+        case INITIALIZE_AND_SHUTDOWN:
         {
             // 本体初期化を行う
             InitializeFileSystem();