rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

cfgのInitialize,Finalizeはメインスレッドで行うように

Browse Source 
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
This commit is contained in:
N2614 2012-04-27 05:30:42 +00:00
parent a8389429d6
commit d5631882cc
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
trunk/SkipFirstLaunch/CfgChanger.cpp
View File

@ -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);

4
trunk/SkipFirstLaunch/main.cpp
View File

@ -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();