From 47a5a71ef66f3a694b75300ba867f41f30e1ac74 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Thu, 24 Feb 2011 07:49:56 +0000
Subject: [PATCH] =?UTF-8?q?SD=E3=82=AB=E3=83=BC=E3=83=89=E6=8C=BF=E5=85=A5?=
 =?UTF-8?q?=E6=99=82=E7=82=B9=E3=81=A7=E3=83=A9=E3=82=A4=E3=83=88=E3=83=97?=
 =?UTF-8?q?=E3=83=AD=E3=83=86=E3=82=AF=E3=83=88=E3=81=AE=E3=83=81=E3=82=A7?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=92=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
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@92 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../ConsoleBackup/Controller.cpp              | 32 +++++++++++--------
 .../ConsoleRestore/Controller.cpp             | 22 +++++++++----
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/Controller.cpp
index c40bfe0..32cd6b5 100644
--- a/trunk/ConsoleDataMigration/ConsoleBackup/Controller.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleBackup/Controller.cpp
@@ -43,6 +43,8 @@ typedef enum BackupState
 
 // APSettingの書式が無い警告サウンドを鳴らしたかどうか
 bool s_ExistAPSettingAnnotation = false;
+// SDに書き込みできない警告サウンドを鳴らしたかどうか
+bool s_SdWriteProetctAnnotation = false;
 
 BackupState s_BackupState = STARTUP;
 bool s_PlayedStartCursor = false;
@@ -73,29 +75,30 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
             // SDカードが挿入されているか？
             if (nn::fs::IsSdmcInserted())
             {
+                // SDカードに書き込みできるか？
+                if (!nn::fs::IsSdmcWritable())
+                {
+                    if (!s_SdWriteProetctAnnotation)
+                    {
+                        s_SdWriteProetctAnnotation = true;
+                        common::PlaySound(common::SOUND_ANNOTATION);
+                    }
+                    operationMessage.push_back(::std::string("Can*t Write SD Card!!\n"));
+                    break;
+                }
+
                 // 無線設定ファイルがあるか？
                 if (common::ExistsAPSetting())
                 {
                     // 書き込み中に抜かないように
                     if (nextStep)
                     {
-                        // SDカードに書き込みできるか？
-                        if (nn::fs::IsSdmcWritable())
+                        // シリアルナンバーを読み取れるか？
+                        if (!CanReadSerialNumber())
                         {
-                            // シリアルナンバーを読み取れるか？
-                            if (!CanReadSerialNumber())
-                            {
-                                common::PlaySound(common::SOUND_ANNOTATION);
-                                COMMON_LOGGER("Can't Read Serial Number\n");
-                            }
-                        }
-                        else
-                        {
-                            error = true;
                             common::PlaySound(common::SOUND_ANNOTATION);
-                            COMMON_LOGGER("Can't Write SD Card!!\n");
+                            COMMON_LOGGER("Can't Read Serial Number\n");
                         }
-
                     }
                 }
                 else
@@ -304,6 +307,7 @@ void InitializeState()
     s_ExistAPSettingAnnotation = false;
     s_PlayedStartCursor = false;
     s_PlayedSdPullOutCursor = false;
+    s_SdWriteProetctAnnotation = false;
 }
 
 } // namespace ConsoleBackup
diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
index c1af941..b8ba3a6 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
@@ -90,6 +90,8 @@ bool s_PlayedSdPullOutCursor = false;
 bool s_ExistsVersionDataAnnotation = false;
 // バージョンデータを読んだかどうか
 bool s_ReadVersionDone = false;
+// SDに書き込みできない警告サウンドを鳴らしたかどうか
+bool s_SdWriteProetctAnnotation = false;
 
 // ネットワークアップデートを開始したかどうか
 bool s_ExecuteFgNup = false;
@@ -234,6 +236,18 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
             // SDカードが挿入されているか？
             if (nn::fs::IsSdmcInserted())
             {
+                // SDカードに書き込みできるか？
+                if (!nn::fs::IsSdmcWritable())
+                {
+                    if (!s_SdWriteProetctAnnotation)
+                    {
+                        s_SdWriteProetctAnnotation = true;
+                        PlaySound(SOUND_ANNOTATION);
+                    }
+                    operationMessage.push_back(::std::string("Can*t Write SD Card!!\n"));
+                    break;
+                }
+
                 CheckAndReadVersionData(operationMessage);
                 validApSetting = CheckAndReadAPSetting(operationMessage);
                 if (!validApSetting)
@@ -277,13 +291,6 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
                                         operationMessage.push_back(::std::string("Serial Number in SD : ") + serial);
                                     }
 
-                                    // SDカードに書き込みできるか？
-                                    if (nextStep && !nn::fs::IsSdmcWritable())
-                                    {
-                                        error = true;
-                                        PlaySound(SOUND_ANNOTATION);
-                                        COMMON_LOGGER("Can't Write SD Card!!\n");
-                                    }
 
                                     // SDカードにリージョンデータがあるか？
                                     if (ExistsRegionData())
@@ -881,6 +888,7 @@ void InitializeState()
     s_PlayedSdPullOutCursor = false;
     s_NupOnlyMode = false;
     s_ReadVersionDone = false;
+    s_SdWriteProetctAnnotation = false;
 }
 
 u32 GetProgress()