From 6f28f9c212658b88f1874e763485b514d36be720 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 25 Mar 2011 05:44:15 +0000
Subject: [PATCH] =?UTF-8?q?=E7=84=A1=E7=B7=9A=E3=81=8COFF=E3=81=AE?=
 =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=83=8D=E3=83=83=E3=83=88=E3=83=AF=E3=83=BC?=
 =?UTF-8?q?=E3=82=AF=E9=96=A2=E4=BF=82=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92?=
 =?UTF-8?q?=E9=80=B2=E3=82=81=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@164 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../ConsoleRestore/Controller.cpp             | 39 +++++++++++++++++--
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
index a54b575..c54d4da 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
@@ -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()