From 52cb27912226ed632cdebb722de4b542918049f6 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 4 Feb 2011 07:02:54 +0000
Subject: [PATCH] =?UTF-8?q?RTC=E5=90=8C=E6=9C=9F=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E3=81=AE=E7=A7=BB=E5=8B=95=20=E3=82=B7=E3=82=B9=E3=83=86?=
 =?UTF-8?q?=E3=83=A0=E6=99=82=E8=A8=88=E3=81=AE=E7=84=A1=E5=8A=B9=E5=8C=96?=
 =?UTF-8?q?=E3=81=AF=E7=A7=BB=E8=A1=8C=E5=85=83=E3=81=AEptm=E3=81=AE?=
 =?UTF-8?q?=E3=82=BB=E3=83=BC=E3=83=96=E3=83=87=E3=83=BC=E3=82=BF=E3=81=8C?=
 =?UTF-8?q?=E4=BD=BF=E3=82=8F=E3=82=8C=E3=81=A6=E3=81=8B=E3=82=89=E8=A1=8C?=
 =?UTF-8?q?=E3=81=86=E5=BF=85=E8=A6=81=E3=81=8C=E3=81=82=E3=82=8B?=
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@16 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../ConsoleRestore/Controller.cpp                    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
index 7fceb67..dad1a6e 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
@@ -144,7 +144,6 @@ void ExecSyncMcuRtc()
     {
         ImportMcuRtc();
         // 時計を無効化する
-        nn::ptm::CTR::InvalidateSystemTime();
         CreateRtcSyncFinishedFile();
     }
 }
@@ -298,6 +297,11 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
                 if (needsUpdate)
                 {
                     COMMON_LOGGER("Start Network Update\n");
+                    // RTC同期を行う
+                    // でいるだけ早いタイミングで同期したいがフラグ用ファイルの存在確認に
+                    // 失敗するのでここで同期する
+                    ExecSyncMcuRtc();
+
                     s_RestoreState = UPDATE_IN_PROGRESS;
                     common::PlaySound(common::SOUND_CURSOR);
                 }
@@ -477,10 +481,6 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
 
             if (nextStep)
             {
-                // RTC同期を行う
-                // RTC書き込み後できるだけ早いタイミングで再起動したいのでここで同期
-                ExecSyncMcuRtc();
-
                 s_RestoreState = REBOOTING;
             }
         }
@@ -501,6 +501,8 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
             if(init)
             {
                 COMMON_LOGGER("Adjust Time\n");
+                // ptmのセーブデータ移行後に時計を無効化する
+                nn::ptm::CTR::InvalidateSystemTime();
                 AdjustTime();
                 init = false;
             }