From 2e3b5ea3c4c86d853d08ecdb2cb91c8e6b3df46a Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 20 Apr 2011 10:57:17 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=8F=E3=83=83=E3=82=B7=E3=83=A5=E6=A4=9C?=
 =?UTF-8?q?=E8=A8=BC=E3=81=AB=E9=80=9A=E3=81=A3=E3=81=9F=E5=BE=8C=E3=81=AE?=
 =?UTF-8?q?NAND=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=81=BF=E6=99=82=E3=81=AB?=
 =?UTF-8?q?=E3=81=BE=E3=81=9A=E5=AF=BE=E8=B1=A1=E3=82=92=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20=E6=99=82?=
 =?UTF-8?q?=E5=88=BB=E5=90=8C=E6=9C=9F=E5=89=8D=E3=81=ABShop::Connect?=
 =?UTF-8?q?=E3=81=97=E3=80=81Ivs=E3=81=AE=E9=80=81=E4=BF=A1=E3=81=A8?=
 =?UTF-8?q?=E3=83=81=E3=82=B1=E3=83=83=E3=83=88=E5=90=8C=E6=9C=9F=E3=82=92?=
 =?UTF-8?q?=E8=A1=8C=E3=81=86=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@209 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../ConsoleRestore/Controller.cpp             | 23 ++++++++-----------
 .../common/FileTransfer.cpp                   |  2 ++
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
index 12bb079..72e3108 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
@@ -1141,24 +1141,21 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep)
             // 削除処理
         case RESTORE_CAL:
         {
-            static bool init = true;
-            if (init)
+            // ptmのセーブデータ移行後に時計を無効化する
+            nn::ptm::CTR::InvalidateSystemTime();
+
+            // cfgの本体固有値をcal値で初期化する
+            result = InitializeHardwareDependentSetting();
+            if (result.IsFailure())
             {
-                // ptmのセーブデータ移行後に時計を無効化する
-                nn::ptm::CTR::InvalidateSystemTime();
-
-                // cfgの本体固有値をcal値で初期化する
-                result = InitializeHardwareDependentSetting();
-                if (result.IsFailure())
-                {
-                    s_RestoreState = FAIL;
-                }
-
-                init = false;
+                s_RestoreState = FAIL;
             }
 
+            init = false;
+
             s_RestoreState = CONNECT_ONLY;
         }
+        break;
 
         case DOWNLOAD_TWL:
         {
diff --git a/trunk/ConsoleDataMigration/common/FileTransfer.cpp b/trunk/ConsoleDataMigration/common/FileTransfer.cpp
index c67d566..6198b31 100644
--- a/trunk/ConsoleDataMigration/common/FileTransfer.cpp
+++ b/trunk/ConsoleDataMigration/common/FileTransfer.cpp
@@ -809,6 +809,8 @@ bool ConfirmFile(nn::fs::FileInputStream* from_file, nn::fs::FileStream* to_file
     else
     {
         NN_LOG("Verification Success %s, Rename\n", GetCharStr(sdPath));
+        // 削除する
+        nn::fs::TryDeleteFile(truePath);
         // リネームする
         result = nn::fs::TryRenameFile(tmpPath, truePath);
         COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);