From 0a3ec6a87edf0d1d863c8a63a8b1e3da063ed911 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Mon, 20 Jun 2011 05:03:05 +0000
Subject: [PATCH] =?UTF-8?q?TWL=E3=83=A6=E3=83=BC=E3=82=B6=E9=A0=98?=
 =?UTF-8?q?=E5=9F=9F=E3=82=92=E5=88=9D=E6=9C=9F=E5=8C=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@340 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Importer.cpp                   | 2 ++
 .../ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 7b114d3..aa7589e 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -616,6 +616,8 @@ void InitializeFileSystem()
         nn::fs::Unmount(common::TWL_ARCHIVE_NAME_TABLE[i]);
     }
 
+    result = nn::am::DeleteAllTwlUserPrograms();
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
     nn::fs::InitializeCtrFileSystem();
 }
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
index b165be6..3a1b0bd 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
@@ -380,10 +380,10 @@ void ShopOperationUnregisterCore(bool force)
     ECAccountInfo* pAccountInfo;
     result = ShopOperationConnect(&pAccountInfo);
     NIM_SHOP_RESULT_CHECK(result);
-    if(force)
+    if (force)
     {
-    if (pAccountInfo->accountStatus && (pAccountInfo->accountStatus[0] == 'R' ||
-            pAccountInfo->accountStatus[0] == 'T'))
+        if (pAccountInfo->accountStatus && (pAccountInfo->accountStatus[0] == 'R' || pAccountInfo->accountStatus[0]
+                == 'T'))
         {
             COMMON_LOGGER_DETAIL("nim::Shop::Unregister\n");
             result = nn::nim::Shop::Unregister();
@@ -392,7 +392,7 @@ void ShopOperationUnregisterCore(bool force)
     }
     else
     {
-    if (pAccountInfo->accountStatus && (pAccountInfo->accountStatus[0] == 'R'))
+        if (pAccountInfo->accountStatus && (pAccountInfo->accountStatus[0] == 'R'))
         {
             COMMON_LOGGER_DETAIL("nim::Shop::Unregister\n");
             result = nn::nim::Shop::Unregister();