From a72bdc5f70e30837a0133759d1347714960682c4 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 3 Jun 2011 05:50:41 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB=E3=83=80?=
 =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=83=AD=E3=83=BC=E3=83=89=E3=81=AE=E3=83=AA?=
 =?UTF-8?q?=E3=83=88=E3=83=A9=E3=82=A4=E5=89=8D=E3=81=AB=E3=82=B9=E3=83=AC?=
 =?UTF-8?q?=E3=83=83=E3=83=89=E3=82=92Finalize=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=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@309 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp                 | 3 ++-
 .../sources/ConsoleRestore/TitleDownloader.cpp            | 8 +++++++-
 .../sources/ConsoleRestore/TitleDownloader.h              | 7 +++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index a8ee975..d4c04e9 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -1342,8 +1342,9 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                     PutAliveMessage(operationMessage, "Download Twl Title");
                 }
 
-                if (DownloadTitleFinished())
+                if (IsDownloadTitleFinished())
                 {
+                    FinalizeTitleDownload();
                     if (DownloadTitleSucceeded())
                     {
                         s_IsSyncClock = true;
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp
index cc480df..60c695d 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp
@@ -127,11 +127,17 @@ void StartTitleDownload()
     s_TitleDownloaderThread.Start(TitleDownloaderThreadFunc, s_TitleDownloaderThreadStack);
 }
 
-bool DownloadTitleFinished()
+bool IsDownloadTitleFinished()
 {
     return s_TitleDownloaderThread.IsValid() && !s_TitleDownloaderThread.IsAlive();
 }
 
+void FinalizeTitleDownload()
+{
+    s_TitleDownloaderThread.Join();
+    s_TitleDownloaderThread.Finalize();
+}
+
 bool DownloadTitleSucceeded()
 {
     return TitleDownloader::m_Result.IsSuccess() && GetShopOperationSingleResult().IsSuccess();
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.h
index 6e6449e..cd1818e 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.h
@@ -24,12 +24,15 @@ namespace ConsoleRestore
 // 新たにスレッドを立て、タイトルのダウンロードを開始する
 void StartTitleDownload();
 
-// タイトルのダウンロードスレッドを終了する
-bool DownloadTitleFinished();
+// タイトルのダウンロードスレッドが終了したかどうか
+bool IsDownloadTitleFinished();
 
 // タイトルのダウンロードスレッドが成功したかどうか
 bool DownloadTitleSucceeded();
 
+// タイトルのダウンロードスレッドを終了する
+void FinalizeTitleDownload();
+
 // タイトルダウンロードの進捗を取得する
 u32 GetTitleDownloadProgress();