From 097b7b04820835d17a36978980d717462feac766 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 20 Mar 2015 08:07:26 +0000
Subject: [PATCH] =?UTF-8?q?NNA=E3=81=8B=E3=82=89=E5=9B=BD=E3=82=B3?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=82=92=E5=89=8A=E9=99=A4?=
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@848 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/ActCompleter.cpp         | 13 ++++---------
 .../sources/ConsoleRestore/ActCompleter.h           |  1 -
 .../sources/ConsoleRestore/Controller.cpp           |  4 ----
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp
index ef68db7..beff3f3 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp
@@ -41,7 +41,6 @@ nn::os::Event ActCompleter::s_EndEvent;
 u32 ActCompleter::s_ApprovalId;
 ActCompleter::CompleteMode ActCompleter::s_Mode;
 ActCompleter::SalvageCheck ActCompleter::s_SalvageCheck;
-nn::cfg::CTR::CfgCountryCode ActCompleter::s_CfgCountryCode;
 
 
 ActCompleter::ActCompleter()
@@ -71,11 +70,6 @@ void ActCompleter::Start(CompleteMode mode, SalvageCheck check)
     s_Thread.Start(Exec, s_ThreadStack);
 }
 
-nn::cfg::CTR::CfgCountryCode ActCompleter::GetCountryCodeFromNna()
-{
-    return s_CfgCountryCode;
-}
-
 bool ActCompleter::IsFinished()
 {
     return s_Thread.IsValid() && !s_Thread.IsAlive();
@@ -156,8 +150,9 @@ nn::Result ActCompleter::ExecImpl()
             nn::cfg::CfgRegionCode region = nn::cfg::GetRegion();
             u8 age = nn::act::GetAgeAtSalvage();
 
+            nn::cfg::CTR::CfgCountryCode country;
             NN_UTIL_RETURN_IF_FAILED_2(
-                    nn::act::GetCountryCodeAtSalvage(reinterpret_cast<u32*>(&s_CfgCountryCode)),
+                    nn::act::GetCountryCodeAtSalvage(reinterpret_cast<u32*>(&country)),
                     nn::act::FinalizeAdmin(),
                     common::FinalizeNetwork());
 
@@ -166,7 +161,7 @@ nn::Result ActCompleter::ExecImpl()
             if (region == nn::cfg::CFG_REGION_AMERICA)
             {
 
-                if (ageChecker.IsCoppaRequired(age, region, s_CfgCountryCode))
+                if (ageChecker.IsCoppaRequired(age, region, country))
                 {
                     // COPPA対象の年齢なら復元する
                     s_ApprovalId = nn::act::GetSalvagedApprovalId();
@@ -178,7 +173,7 @@ nn::Result ActCompleter::ExecImpl()
             }
 
             // PIN必須ならフラグを立てる
-            if (ageChecker.IsPinRestrictionRequired(age, region, s_CfgCountryCode))
+            if (ageChecker.IsPinRestrictionRequired(age, region, country))
             {
                 NN_UTIL_RETURN_IF_FAILED_2(
                         nn::cfg::CTR::system::SetForceParentalControlFlag(true),
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.h
index 93b2852..0a07051 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.h
@@ -60,7 +60,6 @@ private:
     static u32 s_ApprovalId;
     static CompleteMode s_Mode;
     static SalvageCheck s_SalvageCheck;
-    static nn::cfg::CfgCountryCode s_CfgCountryCode;
 };
 
 } /* namespace ConsoleRestore */
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 4dfa455..f97127f 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -927,10 +927,6 @@ void SetupCountryCodeForPreorder(nn::cfg::CTR::CfgCountryCode& country)
     {
         country = GetCountryCodeFromEci();
     }
-    else if (ActCompleter::GetCountryCodeFromNna() != nn::cfg::CTR::CFG_COUNTRY_UNDEFINED)
-    {
-        country = ActCompleter::GetCountryCodeFromNna();
-    }
 }
 
 } // namespace <unnamed>