From 6aa64d6244ad69d176ea58419b59b5f9aed4480c Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Tue, 8 Feb 2011 01:18:14 +0000
Subject: [PATCH] =?UTF-8?q?SD=E3=82=AB=E3=83=BC=E3=83=89=E6=8A=9C=E3=81=91?=
 =?UTF-8?q?=E6=99=82=E3=81=AE=E4=B8=8A=E7=94=BB=E9=9D=A2=E3=81=AE=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E8=89=B2=E3=82=92=E4=B8=8B=E7=94=BB=E9=9D=A2=E3=81=AB?=
 =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B=20typo=E4=BF=AE=E6=AD=A3?=
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@32 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp | 2 +-
 trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp   | 2 +-
 trunk/ConsoleDataMigration/ConsoleRestore/Importer.h     | 2 +-
 trunk/ConsoleDataMigration/common/DrawSystemState.cpp    | 7 ++++++-
 trunk/ConsoleDataMigration/common/DrawSystemState.h      | 1 +
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
index d70395a..86016a0 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
@@ -611,7 +611,7 @@ void OnSdEjected()
     else
     {
         InitializeState();
-        ClearFileReadReslt();
+        ClearFileReadResult();
     }
 }
 
diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
index 012d542..19fc1a8 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
@@ -1167,7 +1167,7 @@ void ImportTwlSoundData()
     ImportTwlData(common::TWL_SOUND);
 }
 
-void ClearFileReadReslt()
+void ClearFileReadResult()
 {
     s_CheckedEqualsIVSFileandIVS = false;
     s_ReadSerialNumber = false;
diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h
index d4a37ee..0dc1bf0 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h
@@ -65,7 +65,7 @@ void ImportMcuRtc();
 // TWL写真領域を初期化してから本体初期化を行う
 void InitializeFileSystem();
 
-void ClearFileReadReslt();
+void ClearFileReadResult();
 
 // プレイ履歴を読み込みます。ptmのセーブデータ移行後に呼び出す必要があります
 void ImportPlayHistory();
diff --git a/trunk/ConsoleDataMigration/common/DrawSystemState.cpp b/trunk/ConsoleDataMigration/common/DrawSystemState.cpp
index 8ca7170..ef2058a 100644
--- a/trunk/ConsoleDataMigration/common/DrawSystemState.cpp
+++ b/trunk/ConsoleDataMigration/common/DrawSystemState.cpp
@@ -66,10 +66,15 @@ void DrawSystemState
     {
         renderSystem.SetClearColor(GetRenderTarget(NN_GX_DISPLAY0, flip), SUCCESS_COLOR);
     }
-    if (isBackupFailed)
+    else if (isBackupFailed)
     {
         renderSystem.SetClearColor(GetRenderTarget(NN_GX_DISPLAY0, flip), FAIL_COLOR);
     }
+    else
+    {
+        renderSystem.SetClearColor(GetRenderTarget(NN_GX_DISPLAY0, flip), NORMAL_COLOR);
+    }
+
 
     renderSystem.Clear();
     renderSystem.SetColor(1.f, 1.f, 1.f);
diff --git a/trunk/ConsoleDataMigration/common/DrawSystemState.h b/trunk/ConsoleDataMigration/common/DrawSystemState.h
index 7b7a996..3a99da5 100644
--- a/trunk/ConsoleDataMigration/common/DrawSystemState.h
+++ b/trunk/ConsoleDataMigration/common/DrawSystemState.h
@@ -38,6 +38,7 @@
 #define BLUE_COLOR      0.f, 0.f, 1.f, 1.f
 #define SUCCESS_COLOR   0.f, 0.6f,0.f, 1.f
 #define FAIL_COLOR      0.6f, 0.f,0.f, 1.f
+#define NORMAL_COLOR    0.f, 0.f, 0.f, 1.f
 
 namespace common
 {