IVSのチェックを本体初期化前に移動

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@89 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-02-24 05:41:38 +00:00
parent 2f374a6bb5
commit e82097d992

View File

@ -272,16 +272,6 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
operationMessage.push_back(::std::string("Serial Number in SD : ") + serial); operationMessage.push_back(::std::string("Serial Number in SD : ") + serial);
} }
// SDカードにIVSがあるか
if (!ExistsIVSFile())
{
// 移行不能なのでFAIL
COMMON_LOGGER("Can't Read IVS in SD Card!!\n");
error = true;
s_RestoreState = FAIL;
}
else
{
// SDカードに書き込みできるか // SDカードに書き込みできるか
if (nextStep && !nn::fs::IsSdmcWritable()) if (nextStep && !nn::fs::IsSdmcWritable())
{ {
@ -289,7 +279,6 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
PlaySound(SOUND_ANNOTATION); PlaySound(SOUND_ANNOTATION);
COMMON_LOGGER("Can't Write SD Card!!\n"); COMMON_LOGGER("Can't Write SD Card!!\n");
} }
}
// SDカードにリージョンデータがあるか // SDカードにリージョンデータがあるか
if(ExistsRegionData()) if(ExistsRegionData())
@ -312,6 +301,15 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
} }
else else
{
if (!ExistsIVSFile())
{
// 移行不能なのでFAIL
COMMON_LOGGER("Can't Read IVS in SD Card!!\n");
error = true;
s_RestoreState = FAIL;
}
else
{ {
COMMON_LOGGER("Initialize Console\n"); COMMON_LOGGER("Initialize Console\n");
@ -335,6 +333,7 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
s_RestoreState = REBOOTING; s_RestoreState = REBOOTING;
} }
} }
}
else else
{ {
error = true; error = true;