From 0faf54978264e4b7a372c5ef0a829a8e466f8b80 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 25 Mar 2015 04:29:57 +0000
Subject: [PATCH] =?UTF-8?q?=E9=80=B2=E6=8D=97=E8=A1=A8=E7=A4=BA=E6=99=82?=
 =?UTF-8?q?=E3=81=AB=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=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@851 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../ConsoleRestore/PreorderTitleRestorer.cpp  |  3 ++-
 .../PreorderTitleRestorerManager.cpp          | 20 +++++++------------
 .../PreorderTitleRestorerManager.h            |  1 -
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorer.cpp
index bdef00c..2df7543 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorer.cpp
@@ -72,7 +72,7 @@ nn::Result PreorderTitleRestorer::Execute(nn::ProgramId list[], size_t size, nn:
 
     for(s32 i = 0; i < size; ++i)
     {
-        m_Progress = i * 100 / size;
+        NN_LOG("progress=%llu\n", m_Progress);
         std::string xml;
         nn::cfg::CfgCountryCode deliveredCountry;
         COMMON_LOGGER_RETURN_RESULT_IF_FAILED(
@@ -80,6 +80,7 @@ nn::Result PreorderTitleRestorer::Execute(nn::ProgramId list[], size_t size, nn:
 
         COMMON_LOGGER_RETURN_RESULT_IF_FAILED(
                 SetExternalSeedOrPlayableDate(list[i], deliveredCountry, xml));
+        m_Progress = (i + 1) * 100 / size;
     }
 
     COMMON_LOGGER_RETURN_RESULT_IF_FAILED(
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp
index 95cc4ac..86f39e1 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp
@@ -22,7 +22,6 @@ const size_t PreorderTitleRestorerManager::STACK_SIZE;
 nn::Result PreorderTitleRestorerManager::s_Result;
 nn::os::Thread PreorderTitleRestorerManager::s_Thread;
 nn::os::StackBuffer<PreorderTitleRestorerManager::STACK_SIZE> PreorderTitleRestorerManager::s_ThreadStack;
-bool PreorderTitleRestorerManager::s_Started = false;
 PreorderTitleRestorer* PreorderTitleRestorerManager::m_Restorer = NULL;
 nn::ProgramId* PreorderTitleRestorerManager::s_List;
 size_t PreorderTitleRestorerManager::s_Size;
@@ -44,20 +43,16 @@ PreorderTitleRestorerManager::~PreorderTitleRestorerManager()
 
 void PreorderTitleRestorerManager::Start(nn::ProgramId list[], size_t size, nn::cfg::CTR::CfgCountryCode country, nn::cfg::CTR::CfgRegionCode region)
 {
-    if(!s_Started)
-    {
-        s_List = list;
-        s_Size = size;
-        s_Country = country;
-        s_Region = region;
-        s_Thread.Start(ThreadFunc, s_ThreadStack);
-        s_Started = true;
-    }
+    s_List = list;
+    s_Size = size;
+    s_Country = country;
+    s_Region = region;
+    s_Thread.Start(ThreadFunc, s_ThreadStack);
 }
 
 bool PreorderTitleRestorerManager::IsFinished()
 {
-    return s_Thread.IsAlive();
+    return s_Thread.IsValid() && !s_Thread.IsAlive();
 }
 
 nn::Result PreorderTitleRestorerManager::GetResult()
@@ -67,7 +62,7 @@ nn::Result PreorderTitleRestorerManager::GetResult()
 
 void PreorderTitleRestorerManager::End()
 {
-    if(s_Started)
+    if(s_Thread.IsValid())
     {
         s_Thread.Join();
         s_Thread.Finalize();
@@ -75,7 +70,6 @@ void PreorderTitleRestorerManager::End()
         {
             delete m_Restorer;
         }
-        s_Started = false;
     }
 }
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.h
index 8312761..a4c99d3 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.h
@@ -49,7 +49,6 @@ private:
     static const size_t STACK_SIZE = 12 * 1024;
     static nn::os::StackBuffer<STACK_SIZE> s_ThreadStack;
     static PreorderTitleRestorer* m_Restorer;
-    static bool s_Started;
 };
 
 } /* namespace ConsoleRestore */