From 31a12ef522e38cb5a12d9a697e3bf5633698b0c8 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 24 Feb 2012 08:11:24 +0000
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=8F=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=8C=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=82=81=E3=81=A6=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E3=83=90=E3=83=83=E3=82=AF=E3=82=A2=E3=83=83=E3=83=97?=
 =?UTF-8?q?=E3=81=AB=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=82=80=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@656 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/SkipFirstLaunch/CfgChanger.cpp | 15 +++++++++++++--
 trunk/SkipFirstLaunch/CfgChanger.h   |  7 +++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/trunk/SkipFirstLaunch/CfgChanger.cpp b/trunk/SkipFirstLaunch/CfgChanger.cpp
index 84e1274..a2b3efe 100644
--- a/trunk/SkipFirstLaunch/CfgChanger.cpp
+++ b/trunk/SkipFirstLaunch/CfgChanger.cpp
@@ -141,19 +141,23 @@ nn::Result CfgChanger::CheckBackupFormat()
 
 nn::Result CfgChanger::ImportToBackup()
 {
+    NN_UTIL_RETURN_IF_FAILED(
+            GetCfgData()
+    );
+
     // バックアップメモリをフォーマットします
     NN_UTIL_RETURN_IF_FAILED(
             nn::fs::FormatSaveData(FILE_NUM, DIR_NUM, DUPLICATE)
     );
 
     NN_UTIL_RETURN_IF_FAILED(
-            ImportCfgDataToBackup()
+            ImportCfgDatatoBackup()
     );
 
     return nn::ResultSuccess();
 }
 
-nn::Result CfgChanger::ImportCfgDataToBackup()
+nn::Result CfgChanger::GetCfgData()
 {
     using namespace nn::cfg::CTR::detail;
     nn::Result result;
@@ -242,6 +246,13 @@ nn::Result CfgChanger::ImportCfgDataToBackup()
     NN_UTIL_RETURN_IF_FAILED(result);
     nn::cfg::nor::CTR::Finalize();
 
+    return nn::ResultSuccess();
+}
+
+nn::Result CfgChanger::ImportCfgDatatoBackup()
+{
+    nn::Result result;
+
     result = nn::fs::MountSaveData("data:");
     NN_UTIL_RETURN_IF_FAILED(result);
 
diff --git a/trunk/SkipFirstLaunch/CfgChanger.h b/trunk/SkipFirstLaunch/CfgChanger.h
index ab33e2a..a0889a0 100644
--- a/trunk/SkipFirstLaunch/CfgChanger.h
+++ b/trunk/SkipFirstLaunch/CfgChanger.h
@@ -35,8 +35,11 @@ private:
     // バックアップメモリのフォーマットをチェックします
     nn::Result CheckBackupFormat();
 
-    // CFGデータをバックアップメモリに書き込みます
-    nn::Result ImportCfgDataToBackup();
+    // CFGデータを読み込みます
+    nn::Result GetCfgData();
+
+    // 読み込んだCFGデータをバックアップメモリに書き込みます
+    nn::Result ImportCfgDatatoBackup();
 
     // CFGのデータをバックアップメモリから書き込みます
     nn::Result RestoreCfgDataFromBackup();