From 06778aee07c432f07b73c567c5beebb63e209581 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 29 Jun 2011 08:29:00 +0000
Subject: [PATCH] =?UTF-8?q?r348=E3=81=AEIVS=E3=81=AE=E6=9B=B8=E3=81=8D?=
 =?UTF-8?q?=E8=BE=BC=E3=81=BF=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0?=
 =?UTF-8?q?=E3=82=92=E5=85=83=E3=81=AB=E6=88=BB=E3=81=99?=
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@349 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp         | 15 +++------------
 .../sources/ConsoleRestore/Importer.cpp           |  9 ++++-----
 .../sources/ConsoleRestore/Importer.h             |  3 ---
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 19d2a95..560c971 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -1260,19 +1260,10 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
         case POST_RESTORE:
         {
             operationMessage.push_back(::std::string("Post Process..."));
+            // 書き込み完了ファイルを作成
+            CreateWriteFinishedFile();
 
-            // SDカードのIVSファイルを書き込む
-            if(ImportIvsData())
-            {
-                // 書き込み完了ファイルを作成
-                CreateWriteFinishedFile();
-
-                s_RestoreState = RESTORE_DONE;
-            }
-            else
-            {
-                s_RestoreState = FAIL;
-            }
+            s_RestoreState = RESTORE_DONE;
         }
         break;
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 581511f..446f25d 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -690,11 +690,6 @@ nn::Result ImportIvs()
     return result;
 }
 
-bool ImportIvsData()
-{
-    return ImportIvs().IsSuccess();
-}
-
 void ImportThreadFunc()
 {
     nn::Result result;
@@ -1861,6 +1856,10 @@ nn::Result ImportData()
         // NANDのごみを削除する
         Cleanup();
 
+        // SDカードのIVSファイルを書き込む
+        result = ImportIvs();
+        NN_UTIL_RETURN_IF_FAILED(result);
+
         // NORデータを書き込む
         result = ImportNorData();
         NN_UTIL_RETURN_IF_FAILED(result);
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
index b55c9d4..cbe3cb5 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
@@ -154,9 +154,6 @@ nn::Result ReadVersionData();
 // SDカードのNintendo 3DS以下ににIVSと一致するディレクトリがあるかどうか
 bool ExistsIvsDirectory(std::string& ivsRoot);
 
-// SDカードのIVSデータを書き込む
-bool ImportIvsData();
-
 }
 
 #endif /* IMPORTER_H_ */