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(); }