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

無線がOFFの場合ネットワーク関係の処理を進めないように

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@164 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-03-25 05:44:15 +00:00
parent d63c5f8595
commit 6f28f9c212
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
View File

@ -21,6 +21,7 @@
#include <nn/ptm/CTR/ptm_ApiSystem.h>
#include <nn/pl/CTR/pl_PlayHistoryApiSysmenu.h>
#include <nn/cfg/CTR/cfg_ApiSys.h>
#include <nn/nwm.h>
#include "Controller.h"
#include "FileChecker.h"
@ -96,6 +97,8 @@ bool s_ReadVersionDone = false;
nn::Result s_ReadVersionResult = nn::ResultSuccess();
// SDに書き込みできない警告サウンドを鳴らしたかどうか
bool s_SdWriteProetctAnnotation = false;
// WiFiがOFFである警告サウンドを鳴らしたかどうか
bool s_WifiStatusOffAnnotation = false;
// ネットワークアップデートを開始したかどうか
bool s_ExecuteFgNup = false;
@ -374,8 +377,21 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
{
if (validApSetting)
{
// 削除処理を行う
needsErase = true;
if(nn::nwm::CTR::IsWifiOn())
{
// 削除処理を行う
needsErase = true;
}
else
{
if(!s_WifiStatusOffAnnotation)
{
s_WifiStatusOffAnnotation = true;
PlaySound(SOUND_ANNOTATION);
}
operationMessage.push_back(::std::string("Wireless is Off\n"));
error = true;
}
}
}
}
@ -383,8 +399,22 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
{
if (validApSetting)
{
// ネットワークアップデートを行う
needsUpdate = true;
if(nn::nwm::CTR::IsWifiOn())
{
// ネットワークアップデートを行う
needsUpdate = true;
}
else
{
if (!s_WifiStatusOffAnnotation)
{
s_WifiStatusOffAnnotation = true;
PlaySound(SOUND_ANNOTATION);
}
operationMessage.push_back(::std::string("Wireless is Off\n"));
error = true;
}
}
}
@ -929,6 +959,7 @@ void InitializeState()
s_ReadVersionDone = false;
s_SdWriteProetctAnnotation = false;
s_ReadVersionResult = nn::ResultSuccess();
s_WifiStatusOffAnnotation = false;
}
u32 GetProgress()