From 14d6ed52098d75a57fd911b938c2255b4d7ef332 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Thu, 26 Jan 2012 06:20:58 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=97=E3=83=AA=E3=82=A4=E3=83=B3=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=83=BC=E3=83=AB=E3=82=A2=E3=83=97=E3=83=AA=E3=83=80?=
 =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=83=AD=E3=83=BC=E3=83=89=E3=83=A2=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=81=A7=E3=82=A4=E3=83=B3=E3=82=BF=E3=83=BC=E3=83=8D?=
 =?UTF-8?q?=E3=83=83=E3=83=88=E8=A8=AD=E5=AE=9A=E3=82=92=E5=85=83=E3=81=AB?=
 =?UTF-8?q?=E6=88=BB=E3=81=99=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@608 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp     | 10 +++++++
 .../sources/ConsoleRestore/Importer.cpp       | 25 ++++++++++++++++++
 .../sources/ConsoleRestore/Importer.h         |  3 +++
 .../sources/ConsoleRestore/NtpClient.cpp      | 26 -------------------
 4 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index be80685..8a9a204 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -1530,6 +1530,9 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                     {
                         s_RestoreState = WAIT_SD_EJECT;
 
+                        // インターネット設定を元に戻す
+                        RestoreCurrentInternetSetting();
+
                         // リストア状態チェックファイルをすべて削除
                         DeleteAllCheckFiles();
                     }
@@ -1770,6 +1773,10 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 {
                     NN_LOG("AP Setting Exists. OK\n");
                     COMMON_LOGGER("Download PreInstalled Application failed\n");
+
+                    // インターネット設定を元に戻す
+                    RestoreCurrentInternetSetting();
+
                     ChangeState(saved, s_RestoreState, FAIL);
                 }
                 else
@@ -1858,6 +1865,9 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 if (ExistsAPSetting())
                 {
                     NN_LOG("AP Setting Exists. OK\n");
+                    // インターネット設定を元に戻す
+                    RestoreCurrentInternetSetting();
+
                     if(s_PreinstallTitleDownloadSuccess)
                     {
                         COMMON_LOGGER("Download PreInstalled Application done\n");
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 733515e..4d16c89 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -1988,6 +1988,31 @@ void RepairSimpleAddress()
     }
 }
 
+void RestoreCurrentInternetSetting()
+{
+    COMMON_LOGGER("Restore Current Internet Setting\n");
+    nn::Result result;
+    if (GetTempNetworkSetting()->isValid)
+    {
+        result = nn::ac::CTR::UpdateNetworkSetting(0, GetTempNetworkSetting()->setting);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
+    }
+    else
+    {
+        // 無効の場合は消去しておく
+        result = nn::ac::CTR::RemoveNetworkSetting(0);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
+    }
+
+    result = nn::ac::FlushNetworkSetting();
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
+
+    result = nn::ac::FinalizeInternal();
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
+}
+
+
+
 nn::Result ImportData()
 {
     static nn::Result result = nn::ResultSuccess();
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
index f3cc230..73818ca 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
@@ -118,6 +118,9 @@ char* GetNtpServerName();
 // 先にReadSettingが成功している必要がある
 TimeZone GetTimeZone();
 
+// インターネット設定をユーザの設定に戻す
+void RestoreCurrentInternetSetting();
+
 struct CheckedNetworkSetting
 {
     nn::ac::CTR::NetworkSetting setting;
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NtpClient.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NtpClient.cpp
index b28303f..885fc43 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NtpClient.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NtpClient.cpp
@@ -238,29 +238,6 @@ bool GetNtpTime(u32* ntpTime)
     return retval;
 }
 
-void RestoreCurrentInternetSetting()
-{
-    COMMON_LOGGER("Restore Current Internet Setting\n");
-    nn::Result result;
-    if (GetTempNetworkSetting()->isValid)
-    {
-        result = nn::ac::CTR::UpdateNetworkSetting(0, GetTempNetworkSetting()->setting);
-        COMMON_LOGGER_RESULT_IF_FAILED(result);
-    }
-    else
-    {
-        // 無効の場合は消去しておく
-        result = nn::ac::CTR::RemoveNetworkSetting(0);
-        COMMON_LOGGER_RESULT_IF_FAILED(result);
-    }
-
-    result = nn::ac::FlushNetworkSetting();
-    COMMON_LOGGER_RESULT_IF_FAILED(result);
-
-    result = nn::ac::FinalizeInternal();
-    COMMON_LOGGER_RESULT_IF_FAILED(result);
-}
-
 }
 
 void NtpThreadFunc()
@@ -298,9 +275,6 @@ void NtpThreadFunc()
         COMMON_LOGGER("Failed Get Ntp Time\n");
         s_NtpSyncSuccessed = false;
     }
-
-    // インターネット設定を元に戻す
-    RestoreCurrentInternetSetting();
 }
 
 bool IsTimeAdjustFinished()