From ccc676edaea7dc620f4a86986a9a940318d4aed2 Mon Sep 17 00:00:00 2001 From: N2614 Date: Sat, 4 Jun 2011 09:34:24 +0000 Subject: [PATCH] =?UTF-8?q?GetProgress=E3=81=AEResult=E3=82=92=E3=83=81?= =?UTF-8?q?=E3=82=A7=E3=83=83=E3=82=AF=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=20=E5=A4=89=E6=95=B0=E5=90=8D=E5=A4=89=E6=9B=B4?= 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@314 385bec56-5757-e545-9c3a-d8741f4650f1 --- trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp | 6 +----- trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp index efd3931..3e2f204 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp @@ -484,13 +484,9 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param) while (true) { result = nn::nim::Shop::GetProgress(&latest); - // 既にインポート済み - if (result == nn::am::ResultAlreadyExists()) - { - break; - } NIM_SHOP_RESULT_CHECK(result); + NIM_SHOP_RESULT_CHECK(latest.lastResult); // Print progress if (latest != before) diff --git a/trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp b/trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp index c77bd09..373230e 100644 --- a/trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp +++ b/trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp @@ -52,7 +52,7 @@ void CommonLogger::Finalize() void CommonLogger::Print(const char* fmt, ...) { - nn::os::CriticalSection::ScopedLock lock(m_CriticalSection); + nn::os::CriticalSection::ScopedLock sdLock(m_CriticalSection); va_list vlist; va_start(vlist, fmt); @@ -66,7 +66,7 @@ void CommonLogger::Print(const char* fmt, ...) void CommonLogger::PrintResultSdLog(const char* fmt, ...) { - nn::os::CriticalSection::ScopedLock lock(m_CriticalSection); + nn::os::CriticalSection::ScopedLock sdLock(m_CriticalSection); va_list vlist; va_start(vlist, fmt); @@ -78,7 +78,7 @@ void CommonLogger::PrintResultSdLog(const char* fmt, ...) void CommonLogger::ClearSdLog() { - nn::os::CriticalSection::ScopedLock lock(m_CriticalSection); + nn::os::CriticalSection::ScopedLock sdLock(m_CriticalSection); GetSdInstance()->Clear(); }