From a8c57376c4530c684f9e54d346ab841bd7ecddef Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Mon, 23 May 2011 01:43:18 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=90=E3=82=A4=E3=82=B9ID=E6=AF=94?=
 =?UTF-8?q?=E8=BC=83=E7=B5=90=E6=9E=9C=E3=82=92=E6=AD=A3=E3=81=97=E3=81=8F?=
 =?UTF-8?q?=E8=BF=94=E3=81=99=E3=82=88=E3=81=86=E3=81=AB=20=E5=90=8C?=
 =?UTF-8?q?=E4=B8=80=E6=9C=AC=E4=BD=93=E6=9B=B8=E3=81=8D=E6=88=BB=E3=81=97?=
 =?UTF-8?q?=E6=99=82=E3=81=AE=E3=82=B7=E3=83=BC=E3=82=B1=E3=83=B3=E3=82=B9?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
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@264 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp                | 1 -
 .../sources/ConsoleRestore/Importer.cpp                  | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 9e17522..5b74b01 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -304,7 +304,6 @@ void CheckAccountDeleted(common::HardwareStateManager& manager, ::std::vector<st
         // 同一本体下記書き戻しの場合はアカウント削除しない
         if(EqualsDeviceIdFileandDeviceId(manager).IsSuccess())
         {
-            CreateDeleteAccountFinishedFile();
             // IVS専用モードならばIVSを取得させる
             if(s_GetIvsOnlyMode)
             {
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 2abf898..2f1c43b 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -277,10 +277,11 @@ nn::Result EqualsDeviceIdFileandDeviceId(common::HardwareStateManager& manager)
             {
                 result = nn::ResultSuccess();
             }
-
-            result = nn::Result(nn::Result::LEVEL_STATUS, nn::Result::SUMMARY_INVALID_RESULT_VALUE,
-                    nn::Result::MODULE_COMMON, nn::Result::DESCRIPTION_INVALID_RESULT_VALUE);
-            return result;
+            else
+            {
+                result = nn::Result(nn::Result::LEVEL_STATUS, nn::Result::SUMMARY_INVALID_RESULT_VALUE,
+                        nn::Result::MODULE_COMMON, nn::Result::DESCRIPTION_INVALID_RESULT_VALUE);
+            }
         }
         common::HeapManager::GetHeap()->Free(buf);
     }