From fe46187d4d07c6b2260e7cc93d3781de5fdb956f Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Tue, 25 Nov 2014 06:36:10 +0000
Subject: [PATCH] =?UTF-8?q?SD=E3=82=AB=E3=83=BC=E3=83=89=E3=81=AB=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E3=81=95=E3=82=8C=E3=81=9F=E3=83=A6=E3=83=BC=E3=82=B6?=
 =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB=E3=81=AE=E6=A8=A9=E5=88=A9?=
 =?UTF-8?q?=E3=82=92=E6=B6=88=E3=81=9D=E3=81=86=E3=81=A8=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=82=8B=E3=81=AE=E3=81=A7ResultDbmNotInitialized?=
 =?UTF-8?q?=E3=82=92=E7=84=A1=E8=A6=96=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=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@831 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleBackup/Controller.cpp               | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleBackup/Controller.cpp
index 25abb05..1948e73 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/Controller.cpp
@@ -22,6 +22,7 @@
 #include "FileTransfer.h"
 #include "MenuSavedataModifier.h"
 #include <nn/am/am_ApiSystemMenu.h>
+#include <nn/fs/fs_ResultPrivate.h>
 
 #include <nn.h>
 
@@ -248,8 +249,15 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag
             if (init)
             {
                 // 権利の無いタイトルを削除する
-                if(nn::am::DeleteAllExpiredUserPrograms().IsFailure())
+                // SDカードのタイトルも消しにかかるので 必ず発生するResultDbmNotInitializedは無視する
+                nn::Result result = nn::am::DeleteAllExpiredUserPrograms();
+                if(nn::fs::ResultDbmNotInitialized().Includes(result))
                 {
+                    //
+                }
+                else
+                {
+                    COMMON_LOGGER_RESULT_IF_FAILED(result);
                     COMMON_LOGGER("Can't delete expired titles");
                     s_BackupState = FAIL;
                     break;