From b2b9beaf88f4ec9cb6c3e107615a54276049ffdc Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Tue, 1 Nov 2011 07:57:52 +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=E6=99=82=E3=81=AF=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=83=87=E3=83=BC=E3=82=BF=E3=82=92=E8=AA=AD=E3=81=BE?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=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@473 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../1stNUP_1_5_CUP/sources/ConsoleRestore/Controller.cpp  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/branches/1stNUP_1_5_CUP/sources/ConsoleRestore/Controller.cpp b/branches/1stNUP_1_5_CUP/sources/ConsoleRestore/Controller.cpp
index f6ee81d..598f1b7 100644
--- a/branches/1stNUP_1_5_CUP/sources/ConsoleRestore/Controller.cpp
+++ b/branches/1stNUP_1_5_CUP/sources/ConsoleRestore/Controller.cpp
@@ -251,6 +251,7 @@ void CheckApSetting(common::HardwareStateManager& manager, ::std::vector<std::st
         // 1.5CUP限定
         // バックアップバージョンが1.5CUP or IVS取得モードなら
         // リストアせずCUPツールを要求する画面に飛ばす。
+        // NUP専用モードなら無条件で次に進む
         if(CheckNeedsCup(manager, message, goNextStep))
         {
             return;
@@ -269,6 +270,7 @@ bool CheckNeedsCup(common::HardwareStateManager& manager, ::std::vector<std::str
     NN_UNUSED_VAR(message);
     NN_UNUSED_VAR(goNextStep);
 
+    // IVS取得モード
     if (s_GetIvsOnlyMode)
     {
         if (IsLowerthan1_5(manager))
@@ -284,6 +286,12 @@ bool CheckNeedsCup(common::HardwareStateManager& manager, ::std::vector<std::str
             return s_NeedsCup;
         }
     }
+    // NUP専用モード
+    if (s_NupOnlyMode)
+    {
+        s_NeedsCup = false;
+        return s_NeedsCup;
+    }
 
     if(s_ReadSdVersionData)
     {