From d5631882ccac9c9cf5dab0fa80a0ed5c7116afcb Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 27 Apr 2012 05:30:42 +0000
Subject: [PATCH] =?UTF-8?q?cfg=E3=81=AEInitialize,Finalize=E3=81=AF?=
 =?UTF-8?q?=E3=83=A1=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=AC=E3=83=83=E3=83=89?=
 =?UTF-8?q?=E3=81=A7=E8=A1=8C=E3=81=86=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@695 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/SkipFirstLaunch/CfgChanger.cpp | 9 ---------
 trunk/SkipFirstLaunch/main.cpp       | 4 ++++
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/trunk/SkipFirstLaunch/CfgChanger.cpp b/trunk/SkipFirstLaunch/CfgChanger.cpp
index c0d4846..4b179de 100644
--- a/trunk/SkipFirstLaunch/CfgChanger.cpp
+++ b/trunk/SkipFirstLaunch/CfgChanger.cpp
@@ -167,8 +167,6 @@ nn::Result CfgChanger::GetCfgData()
     using namespace nn::cfg::CTR::detail;
     nn::Result result;
 
-    nn::cfg::CTR::system::Initialize();
-
     s_SaveData.m_DateTime = nn::fnd::DateTime::GetNow();
 
     // cfg の情報取得
@@ -243,8 +241,6 @@ nn::Result CfgChanger::GetCfgData()
     result = nn::cfg::CTR::system::GetConfig(&s_SaveData.m_DebugParam, sizeof(s_SaveData.m_DebugParam), GET_CFG_KEY(NN_CFG_DBG, NN_CFG_DBG_PARAM));
     NN_UTIL_RETURN_IF_FAILED(result);
 
-    nn::cfg::CTR::system::Finalize();
-
     // NTR 設定 (NOR)
     nn::cfg::nor::CTR::Initialize();
     result = nn::cfg::nor::CTR::GetNtrSetting(&s_SaveData.m_NtrSettingData, &s_SaveData.m_NtrSettingDataEx);
@@ -296,9 +292,6 @@ nn::Result CfgChanger::RestoreCfgDataFromBackup()
     result = file.TryRead(&readSize, &s_SaveData, sizeof(s_SaveData));
     NN_UTIL_RETURN_IF_FAILED(result);
 
-
-    nn::cfg::CTR::system::Initialize();
-
     // バージョン確認
     VerDef currentVersion;
     NN_UTIL_RETURN_IF_FAILED(
@@ -391,8 +384,6 @@ nn::Result CfgChanger::RestoreCfgDataFromBackup()
     result = nn::cfg::CTR::system::FlushConfig();
     NN_UTIL_RETURN_IF_FAILED(result);
 
-    nn::cfg::CTR::system::Finalize();
-
     // NTR 設定 (NOR)
     nn::cfg::nor::CTR::Initialize();
     result = nn::cfg::nor::CTR::SetNtrSetting(&s_SaveData.m_NtrSettingData, &s_SaveData.m_NtrSettingDataEx);
diff --git a/trunk/SkipFirstLaunch/main.cpp b/trunk/SkipFirstLaunch/main.cpp
index 49a2eee..c7c3950 100644
--- a/trunk/SkipFirstLaunch/main.cpp
+++ b/trunk/SkipFirstLaunch/main.cpp
@@ -17,6 +17,7 @@
 #include <nn/applet.h>
 #include <nn/cfg.h>
 #include <nn/cfg/CTR/cfg_ApiInit.h>
+#include <nn/cfg/CTR/cfg_ApiSys.h>
 #include <nn/cfg/CTR/detail/cfg_Keys.h>
 #include <nn/ns.h>
 #include <nn/hid/CTR/hid_ApiWithPrivilege.h>
@@ -68,6 +69,7 @@ extern "C" void nnMain()
     nn::Result result;
     nn::applet::Enable();
     nn::cfg::CTR::init::Initialize();
+    nn::cfg::CTR::system::Initialize();
 
     nn::os::Initialize();
     nn::fs::Initialize();
@@ -147,6 +149,8 @@ extern "C" void nnMain()
             result = nn::ns::FinalizeForShell();
             HANDLE_ERROR(result);
             s_RenderSystem.Finalize();
+            nn::cfg::CTR::init::Finalize();
+            nn::cfg::CTR::system::Finalize();
             result = nn::applet::PrepareToCloseApplication();
             HANDLE_ERROR(result);
             result = nn::applet::CloseApplication();