From 842d745c5ea2b230ff1fda8563ae132829d6dfe8 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Mon, 25 Feb 2013 02:41:13 +0000
Subject: [PATCH] =?UTF-8?q?NUP=E5=AE=9F=E8=A1=8C=E5=89=8D=E3=81=ABSD?=
 =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E3=81=AB=E5=90=B8=E3=81=84=E5=87=BA?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E3=82=B7=E3=83=AA=E3=82=A2=E3=83=AB=E3=83=8A?=
 =?UTF-8?q?=E3=83=B3=E3=83=90=E3=83=BC=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=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@725 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp     | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 34b130a..c7a3cf5 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -237,6 +237,18 @@ void CheckExistsSerialNumber(common::HardwareStateManager& manager, common::Oper
 void CheckIvsinSd(common::HardwareStateManager& manager, common::OperationMessage& message, bool& goNextStep);
 void CheckRegioinSd(common::HardwareStateManager& manager, common::OperationMessage& message, bool& goNextStep);
 
+bool DisplaySerialNumberinSD(common::OperationMessage& message)
+{
+    u8 serial[nn::cfg::CTR::CFG_SECURE_INFO_SERIAL_NO_LEN];
+    COMMON_LOGGER_RETURN_FALSE_IF_FAILED(
+            ReadSerialNumber(serial));
+
+    ::std::string serialStr(reinterpret_cast<char*>(serial));
+    message.Add((::std::string("Serial Number in SD : ") + serialStr).c_str());
+    return true;
+}
+
+
 // SDカード挿入チェック
 void CheckSdInserted(common::HardwareStateManager& manager, common::OperationMessage& message, bool& goNextStep)
 {
@@ -873,6 +885,12 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag
 
         case WAIT_START_UPDATE:
         {
+            //シリアルが存在しない場合がある
+            if (common::ExistsSerialNumberFile() && !DisplaySerialNumberinSD(operationMessage))
+            {
+                s_RestoreState = FAIL;
+            }
+
             operationMessage.Add("Push A or START Button");
             operationMessage.Add("Network Update Mode");
             PlayCursorSound(WAIT_START_UPDATE);
@@ -891,14 +909,8 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag
 
         case WAIT_START_IMPORT:
         {
-            u8 serial[nn::cfg::CTR::CFG_SECURE_INFO_SERIAL_NO_LEN];
-            result = ReadSerialNumber(serial);
-            if (result.IsSuccess())
-            {
-                ::std::string serialStr(reinterpret_cast<char*> (serial));
-                operationMessage.Add((::std::string("Serial Number in SD : ") + serialStr).c_str());
-            }
-            else
+            // 必ずシリアルが存在するはず
+            if(!DisplaySerialNumberinSD(operationMessage))
             {
                 s_RestoreState = FAIL;
             }