From 5b9bcf5eb021d5c66e6b30cadfa57333098a3544 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Tue, 31 May 2011 12:29:38 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E7=94=A8?=
 =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=8C=E8=B6=B3?=
 =?UTF-8?q?=E3=82=8A=E3=81=AA=E3=81=84=E3=81=9F=E3=82=81=E7=AF=84=E5=9B=B2?=
 =?UTF-8?q?=E5=A4=96=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=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@297 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp                    | 5 +++++
 trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.h     | 1 +
 .../sources/ConsoleRestore/TitleDownloader.cpp               | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 2a6ad50..256dfd7 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -1027,6 +1027,11 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
 
         case WAIT_START_TRANSFER_ACCOUNT:
         {
+            if(s_SkipNupMode)
+            {
+                operationMessage.push_back(::std::string("After Operating BMS Account Transfer,"));
+            }
+
             operationMessage.push_back(::std::string("Push A or START Button"));
             operationMessage.push_back(::std::string("Transfer Account Mode"));
             if (!s_PlayedStartCursor)
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.h
index 1767cf6..3840b31 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.h
@@ -43,6 +43,7 @@ const char* const SHOP_OPERATION_STR[] =
     "Connect",
     "Get Ivs",
     "Unregister",
+    "Force Unregister",
     "Connect Without Close",
     "Download Title"
 };
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp
index f787ced..df9a1db 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp
@@ -202,7 +202,7 @@ void TitleDownloader::Start()
 
         nn::nim::TitleConfig config;
         result = GetTitleConfig(m_ProgramIdList[i], &config);
-        COMMON_LOGGER_RESULT_IF_FAILED(result);
+        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
         if (result.IsSuccess())
         {
             StartShopOperationSingle(SHOP_OPERATION_DOWNLOAD_TITLE, config);