rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

サルベージ失敗時にもサルベージ後に呼ぶべきAPIを呼び出していたのを修正

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@793 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2014-04-30 00:56:54 +00:00
parent 547ed73c72
commit dd108a5a7d
1 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp
View File

@ -122,6 +122,9 @@ nn::Result ActCompleter::ExecImpl()
// アンマウントできたのでアカウントサルベージを実行 // アンマウントできたのでアカウントサルベージを実行
nn::Result result = nn::act::SalvageAccounts(); nn::Result result = nn::act::SalvageAccounts();
// サルベージ終了をシステムに通知
s_EndEvent.Signal();
if(result.IsFailure()) if(result.IsFailure())
{ {
if(nn::act::ResultRequestNotFound().Includes(result) && s_SalvageCheck == ACT_SALVAGE_WITHOUT_CHECK) if(nn::act::ResultRequestNotFound().Includes(result) && s_SalvageCheck == ACT_SALVAGE_WITHOUT_CHECK)
@ -130,7 +133,6 @@ nn::Result ActCompleter::ExecImpl()
} }
else else
{ {
s_EndEvent.Signal();
NN_UTIL_RETURN_IF_FAILED_1( NN_UTIL_RETURN_IF_FAILED_1(
nn::act::FinalizeAdmin(), nn::act::FinalizeAdmin(),
common::FinalizeNetwork()); common::FinalizeNetwork());
@ -141,10 +143,8 @@ nn::Result ActCompleter::ExecImpl()
return result; return result;
} }
} }
else
// サルベージ終了をシステムに通知 {
s_EndEvent.Signal();
// COPPA判定とPIN判定の準備 // COPPA判定とPIN判定の準備
nn::cfg::CfgRegionCode region = nn::cfg::GetRegion(); nn::cfg::CfgRegionCode region = nn::cfg::GetRegion();
u8 age = nn::act::GetAgeAtSalvage(); u8 age = nn::act::GetAgeAtSalvage();
@ -157,10 +157,10 @@ nn::Result ActCompleter::ExecImpl()
AgeChecker ageChecker; AgeChecker ageChecker;
if(region == nn::cfg::CFG_REGION_AMERICA) if (region == nn::cfg::CFG_REGION_AMERICA)
{ {
if(ageChecker.IsCoppaRequired(age, region, country)) if (ageChecker.IsCoppaRequired(age, region, country))
{ {
// COPPA対象の年齢なら復元する // COPPA対象の年齢なら復元する
s_ApprovalId = nn::act::GetSalvagedApprovalId(); s_ApprovalId = nn::act::GetSalvagedApprovalId();
@ -172,7 +172,7 @@ nn::Result ActCompleter::ExecImpl()
} }
// PIN必須ならフラグを立てる // PIN必須ならフラグを立てる
if(ageChecker.IsPinRestrictionRequired(age, region, country)) if (ageChecker.IsPinRestrictionRequired(age, region, country))
{ {
NN_UTIL_RETURN_IF_FAILED_2( NN_UTIL_RETURN_IF_FAILED_2(
nn::cfg::CTR::system::SetForceParentalControlFlag(true), nn::cfg::CTR::system::SetForceParentalControlFlag(true),
@ -185,8 +185,10 @@ nn::Result ActCompleter::ExecImpl()
common::FinalizeNetwork()); common::FinalizeNetwork());
} }
} }
}
// 移行完了 // 移行完了
// サルベージの有無に関わらず呼び出す
NN_UTIL_RETURN_IF_FAILED_2( NN_UTIL_RETURN_IF_FAILED_2(
nn::act::CompleteTransfer(), nn::act::CompleteTransfer(),
nn::act::FinalizeAdmin(), nn::act::FinalizeAdmin(),