From c7e2a86b91cd0f843f3a3be4a08c22c314f673ad Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 20 Mar 2015 08:02:25 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=88=9D=E6=9C=9F=E5=8C=96=E7=8A=B6?=
 =?UTF-8?q?=E6=85=8B=E3=81=A7PreorderTitleRestorer=E3=81=AB=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=82=BB=E3=82=B9=E3=81=97=E3=81=AA=E3=81=84=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=20PreorderTitleRestorer=E3=81=A7nim=E3=81=AE?=
 =?UTF-8?q?=E5=88=9D=E6=9C=9F=E5=8C=96API=E3=82=92=E5=91=BC=E3=81=B3?=
 =?UTF-8?q?=E5=87=BA=E3=81=99=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@847 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/PreorderTitleRestorer.cpp     | 9 +++++++++
 .../ConsoleRestore/PreorderTitleRestorerManager.cpp      | 9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorer.cpp
index 50a0bab..bdef00c 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorer.cpp
@@ -18,8 +18,10 @@
 #include "CommonLogger.h"
 #include "HeapManager.h"
 
+#include <nn/fs.h>
 #include <nn/fs/fs_ApiExternalSeeds.h>
 #include <nn/fs/fs_ApiTitleTags.h>
+#include <nn/nim.h>
 #include <nn/nim/CTR/nim_PrepurchaseTitleTag.h>
 #include <nn/nim/CTR/nim_ShopApi.h>
 
@@ -64,6 +66,10 @@ PreorderTitleRestorer::~PreorderTitleRestorer()
 
 nn::Result PreorderTitleRestorer::Execute(nn::ProgramId list[], size_t size, nn::cfg::CTR::CfgCountryCode country, nn::cfg::CTR::CfgRegionCode region)
 {
+    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(
+            nn::nim::InitializeForShop());
+    nn::fs::Initialize();
+
     for(s32 i = 0; i < size; ++i)
     {
         m_Progress = i * 100 / size;
@@ -76,6 +82,9 @@ nn::Result PreorderTitleRestorer::Execute(nn::ProgramId list[], size_t size, nn:
                 SetExternalSeedOrPlayableDate(list[i], deliveredCountry, xml));
     }
 
+    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(
+            nn::nim::FinalizeForShop());
+
     return nn::ResultSuccess();
 }
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp
index ff036c1..95cc4ac 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/PreorderTitleRestorerManager.cpp
@@ -81,7 +81,14 @@ void PreorderTitleRestorerManager::End()
 
 u64 PreorderTitleRestorerManager::GetProgress()
 {
-    return m_Restorer->GetProgress();
+    if(m_Restorer)
+    {
+        return m_Restorer->GetProgress();
+    }
+    else
+    {
+        return 0;
+    }
 }
 
 void PreorderTitleRestorerManager::ThreadFunc()