From 9eb0ef4b1840142ce7197a8c1f900fea2c42bd06 Mon Sep 17 00:00:00 2001 From: N2614 Date: Thu, 9 Feb 2012 05:42:49 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=90=8D=E3=81=8C=E6=9C=AA=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=81=AE=E6=99=82=E3=81=AB=E3=82=A2=E3=83=9C=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= 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@627 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleRestore/BgsCommunicator.cpp | 2 +- trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.cpp index 28e812d..04eec8f 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.cpp @@ -738,7 +738,7 @@ bool BgsCommunicator::Execute(const void* buf, size_t size) COMMON_LOGGER_RETURN_FALSE_IF_FAILED( m_Result); m_Result = m_HttpCon.SetRootCa(NNSSL_CACERT_PUBLIC_CA_2); COMMON_LOGGER_RETURN_FALSE_IF_FAILED( m_Result); - m_Result = m_HttpCon.SetRootCa(NNSSL_CACERT_PUBLIC_CA_3);\ + m_Result = m_HttpCon.SetRootCa(NNSSL_CACERT_PUBLIC_CA_3); COMMON_LOGGER_RETURN_FALSE_IF_FAILED( m_Result); m_Result = m_HttpCon.SetRootCa(NNSSL_CACERT_PUBLIC_CA_4); COMMON_LOGGER_RETURN_FALSE_IF_FAILED(m_Result); diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp index f15c49a..4a5af24 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp @@ -394,7 +394,7 @@ nn::Result ImportCountryLanguageData() nn::Result result = nn::ResultSuccess(); // 設定済みなら何もしない - if(nn::cfg::CTR::GetCountry() != nn::cfg::CTR::CFG_COUNTRY_UNKNOWN) + if(nn::cfg::CTR::GetCountry() != nn::cfg::CTR::CFG_COUNTRY_UNKNOWN && nn::cfg::CTR::GetCountry() != nn::cfg::CFG_COUNTRY_UNDEFINED) { return result; }