From 7811c33af3082892d59c11ee7659179454b310e6 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 7 Mar 2014 06:27:43 +0000
Subject: [PATCH] =?UTF-8?q?=E3=81=B2=E3=81=A8=E3=81=BE=E3=81=9AResultReque?=
 =?UTF-8?q?stNotFound=E3=82=92=E7=84=A1=E8=A6=96=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=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@776 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/ActCompleter.cpp   | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp
index ce88757..fc5bfb4 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp
@@ -38,13 +38,10 @@ ActCompleter::CompleteMode ActCompleter::s_Mode;
 
 ActCompleter::ActCompleter()
 {
-    // TODO 自動生成されたコンストラクター・スタブ
-
 }
 
 ActCompleter::~ActCompleter()
 {
-    // TODO Auto-generated destructor stub
 }
 
 nn::Result ActCompleter::GetResult()
@@ -55,6 +52,7 @@ nn::Result ActCompleter::GetResult()
 void ActCompleter::Start(CompleteMode mode)
 {
     s_Mode = mode;
+    s_ApprovalId = 0;
     if(s_Mode == ACT_COMPLETE_TRANSFER_WITH_SALVEGE)
     {
         s_BeginEvent.Initialize(false);
@@ -116,12 +114,24 @@ nn::Result ActCompleter::ExecImpl()
         s_BeginEvent.Wait();
 
         // アンマウントできたのでアカウントサルベージを実行
-        NN_UTIL_RETURN_IF_FAILED_3(
-                nn::act::SalvageAccounts(),
-                s_EndEvent.Signal(),
-                nn::act::FinalizeAdmin(),
-                common::FinalizeNetwork()
-                );
+        nn::Result result = nn::act::SalvageAccounts();
+        if(result.IsFailure())
+        {
+            if(nn::act::ResultRequestNotFound().Includes(result))
+            {
+                //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();
         COMMON_LOGGER("ApprovalId = %d\n", s_ApprovalId);
@@ -138,8 +148,7 @@ nn::Result ActCompleter::ExecImpl()
 
     NN_UTIL_RETURN_IF_FAILED_1(
             nn::act::FinalizeAdmin(),
-            common::FinalizeNetwork()
-            );
+            common::FinalizeNetwork());
 
     NN_UTIL_RETURN_IF_FAILED(
             common::FinalizeNetwork());