From 5e513989364e9ff93e04f8ea37fcb27e369b3865 Mon Sep 17 00:00:00 2001 From: N2614 Date: Wed, 25 Mar 2015 05:49:37 +0000 Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E5=89=8D=E5=A4=89=E6=9B=B4=20Preorder?= =?UTF-8?q?TitleRestorerManager::End()=20->=20Stop()?= 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@853 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleRestore/Controller.cpp | 4 ++-- .../sources/ConsoleRestore/PreorderTitleRestorerManager.cpp | 2 +- .../sources/ConsoleRestore/PreorderTitleRestorerManager.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp index 2adf34b..36c86f6 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp @@ -1570,7 +1570,7 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag PutAliveMessage(operationMessage, "Restoring PreOrdered Title"); if(PreorderTitleRestorerManager::IsFinished()) { - PreorderTitleRestorerManager::End(); + PreorderTitleRestorerManager::Stop(); if(PreorderTitleRestorerManager::GetResult().IsFailure()) { if(s_PreorderTitleRestorerRetryCount++ < RETRY_MAX) @@ -1608,7 +1608,7 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag PutAliveMessage(operationMessage, "Restoring PreOrdered Title"); if(PreorderTitleRestorerManager::IsFinished()) { - PreorderTitleRestorerManager::End(); + PreorderTitleRestorerManager::Stop(); if(PreorderTitleRestorerManager::GetResult().IsFailure()) { if(s_PreorderTitleRestorerRetryCount++ < RETRY_MAX) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp index 86f39e1..79751af 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp @@ -60,7 +60,7 @@ nn::Result PreorderTitleRestorerManager::GetResult() return s_Result; } -void PreorderTitleRestorerManager::End() +void PreorderTitleRestorerManager::Stop() { if(s_Thread.IsValid()) { diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.h index a4c99d3..1957f5b 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.h +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.h @@ -34,7 +34,7 @@ public: static bool IsFinished(); static nn::Result GetResult(); - static void End(); + static void Stop(); static u64 GetProgress(); private: