From af6c27869e02043162c9a1f636b5931eba4cc3f3 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 25 Mar 2011 01:44:15 +0000
Subject: [PATCH] =?UTF-8?q?=E7=A2=BA=E4=BF=9D=E3=81=97=E3=81=9F=E3=83=92?=
 =?UTF-8?q?=E3=83=BC=E3=83=97=E8=A7=A3=E6=94=BE=E5=89=8D=E3=81=AEreturn?=
 =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4=20InitializeHardwareDependentSettin?=
 =?UTF-8?q?g=E3=81=AE=E6=88=BB=E3=82=8A=E5=80=A4=E3=82=92=E3=83=81?=
 =?UTF-8?q?=E3=82=A7=E3=83=83=E3=82=AF=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@157 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp | 6 +++++-
 trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp   | 5 +----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
index d8a6432..a54b575 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
@@ -743,7 +743,11 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
                 nn::ptm::CTR::InvalidateSystemTime();
 
                 // cfgの本体固有値をcal値で初期化する
-                InitializeHardwareDependentSetting();
+                result = InitializeHardwareDependentSetting();
+                if(result.IsFailure())
+                {
+                    s_RestoreState = FAIL;
+                }
 
                 init = false;
             }
diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
index 35062b4..7ddfc16 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
@@ -651,11 +651,8 @@ nn::Result ImportIvs()
             }
             nn::fs::Unmount(common::NAND_ARCHIVE_NAME);
         }
-        else
-        {
-            return result;
-        }
         common::HeapManager::GetHeap()->Free(enc);
+        NN_UTIL_RETURN_IF_FAILED(result);
     }
     else
     {