From a3338f521162db729bc3bee46ecadef4ad0d8ef6 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Mon, 19 Dec 2011 05:57:13 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E8=A8=AD=E5=AE=9A=E3=81=8C=E6=9C=AA?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=AE=E5=A0=B4=E5=90=88=E3=81=AE=E3=81=BF?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=99=E3=82=8B=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@539 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp                   | 3 +--
 .../sources/ConsoleRestore/Importer.cpp                     | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 07193ed..93617d2 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -517,8 +517,7 @@ void ShopOperationSingleTemplate(
     // アップデートを行う
     if (!s_ShopOperationExecuted[op])
     {
-        // IVS取得モードの時は国設定を行う
-        if (!s_GetIvsOnlyMode || (s_GetIvsOnlyMode && ImportCountryLanguageData().IsSuccess()))
+        if (ImportCountryLanguageData().IsSuccess())
         {
             StartShopOperationSingle(op);
             s_ShopOperationExecuted[op] = true;
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 0cf6d6e..6ee3cc8 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -390,6 +390,12 @@ nn::Result ImportCountryLanguageData()
 {
     nn::Result result = nn::ResultSuccess();
 
+    // 設定済みなら何もしない
+    if(nn::cfg::CTR::GetCountry() != nn::cfg::CTR::CFG_COUNTRY_UNDEFINED)
+    {
+        return result;
+    }
+
     if (common::ExistsCountryLanguageFile())
     {
         size_t bufSize = 1024;