From cb82c8d23e9323c997285902ab274597506331a1 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Thu, 24 Feb 2011 04:18:19 +0000
Subject: [PATCH] =?UTF-8?q?NUP=E5=B0=82=E7=94=A8=E3=83=A2=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=81=8C=E6=AD=A3=E3=81=97=E3=81=8F=E5=8B=95=E3=81=8F?=
 =?UTF-8?q?=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@86 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
index 62cfd0c..5479d5f 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
@@ -206,7 +206,7 @@ void ExecSyncMcuRtc()
 // Zero NUP限定コード
 bool NeedsNup()
 {
-    if(AlreadyExecutedNup())
+    if(AlreadyExecutedNup() || s_NupOnlyMode)
     {
         return !common::ExistsUpdateCheckedFile();
     }
@@ -235,11 +235,11 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
             if (nn::fs::IsSdmcInserted())
             {
                 CheckAndReadVersionData(operationMessage);
+                validApSetting = CheckAndReadAPSetting(operationMessage);
 
                 // NUPが必要か？
                 if (!NeedsNup())
                 {
-                    validApSetting = CheckAndReadAPSetting(operationMessage);
                     if (s_NupOnlyMode)
                     {
                         s_RestoreState = NUP_ONLY_WAIT_SD_EJECT;
@@ -336,7 +336,7 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
                 }
                 else
                 {
-                    if (CheckAndReadAPSetting(operationMessage))
+                    if (validApSetting)
                     {
                         // ネットワークアップデートを行う
                         needsUpdate = true;