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

ひとまずResultRequestNotFoundを無視するように

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@776 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2014-03-07 06:27:43 +00:00
parent 51d4607926
commit 7811c33af3
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,13 +38,10 @@ ActCompleter::CompleteMode ActCompleter::s_Mode;
ActCompleter::ActCompleter() ActCompleter::ActCompleter()
{ {
// TODO 自動生成されたコンストラクター・スタブ
} }
ActCompleter::~ActCompleter() ActCompleter::~ActCompleter()
{ {
// TODO Auto-generated destructor stub
} }
nn::Result ActCompleter::GetResult() nn::Result ActCompleter::GetResult()
@ -55,6 +52,7 @@ nn::Result ActCompleter::GetResult()
void ActCompleter::Start(CompleteMode mode) void ActCompleter::Start(CompleteMode mode)
{ {
s_Mode = mode; s_Mode = mode;
s_ApprovalId = 0;
if(s_Mode == ACT_COMPLETE_TRANSFER_WITH_SALVEGE) if(s_Mode == ACT_COMPLETE_TRANSFER_WITH_SALVEGE)
{ {
s_BeginEvent.Initialize(false); s_BeginEvent.Initialize(false);
@ -116,12 +114,24 @@ nn::Result ActCompleter::ExecImpl()
s_BeginEvent.Wait(); s_BeginEvent.Wait();
// アンマウントできたのでアカウントサルベージを実行 // アンマウントできたのでアカウントサルベージを実行
NN_UTIL_RETURN_IF_FAILED_3( nn::Result result = nn::act::SalvageAccounts();
nn::act::SalvageAccounts(), if(result.IsFailure())
s_EndEvent.Signal(), {
nn::act::FinalizeAdmin(), if(nn::act::ResultRequestNotFound().Includes(result))
common::FinalizeNetwork() {
); //NNAが無い場合に起こるので無視
}
else
{
s_EndEvent.Signal();
NN_UTIL_RETURN_IF_FAILED_1(
nn::act::FinalizeAdmin(),
common::FinalizeNetwork());
NN_UTIL_RETURN_IF_FAILED(
common::FinalizeNetwork());
}
}
s_ApprovalId = nn::act::GetSalvagedApprovalId(); s_ApprovalId = nn::act::GetSalvagedApprovalId();
COMMON_LOGGER("ApprovalId = %d\n", s_ApprovalId); COMMON_LOGGER("ApprovalId = %d\n", s_ApprovalId);
@ -138,8 +148,7 @@ nn::Result ActCompleter::ExecImpl()
NN_UTIL_RETURN_IF_FAILED_1( NN_UTIL_RETURN_IF_FAILED_1(
nn::act::FinalizeAdmin(), nn::act::FinalizeAdmin(),
common::FinalizeNetwork() common::FinalizeNetwork());
);
NN_UTIL_RETURN_IF_FAILED( NN_UTIL_RETURN_IF_FAILED(
common::FinalizeNetwork()); common::FinalizeNetwork());