From 828778a6672d231c339c1bc5e08e2ccf6b2b94c9 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 9 Dec 2011 08:27:05 +0000
Subject: [PATCH] =?UTF-8?q?IVS=E5=8F=96=E5=BE=97=E3=83=A2=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E6=99=82=E3=81=AF=E5=9B=BD=E8=A8=AD=E5=AE=9A=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@536 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 6bfd366..07193ed 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -517,8 +517,16 @@ void ShopOperationSingleTemplate(
     // アップデートを行う
     if (!s_ShopOperationExecuted[op])
     {
-        StartShopOperationSingle(op);
-        s_ShopOperationExecuted[op] = true;
+        // IVS取得モードの時は国設定を行う
+        if (!s_GetIvsOnlyMode || (s_GetIvsOnlyMode && ImportCountryLanguageData().IsSuccess()))
+        {
+            StartShopOperationSingle(op);
+            s_ShopOperationExecuted[op] = true;
+        }
+        else
+        {
+            s_RestoreState = FAIL;
+        }
     }
 
     // 動いていることを表示