From b021a455eeba7e9ccd57e150030ee6541663f775 Mon Sep 17 00:00:00 2001
From: kamikawa <kamikawa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 12 Jun 2008 06:44:30 +0000
Subject: [PATCH] =?UTF-8?q?(NandInitializerRed)=20SoftFreeBoxCount?=
 =?UTF-8?q?=E3=81=8C0=E3=81=AE=E5=A0=B4=E5=90=88=E3=81=ABTAD=E3=82=92?=
 =?UTF-8?q?=E4=B8=8A=E6=9B=B8=E3=81=8D=E3=82=A4=E3=83=B3=E3=83=9D=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=83=90=E3=82=B0?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1619 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../ARM9.TWL/src/process_import.c             | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_import.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_import.c
index 0f17458b..02439b0e 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_import.c
+++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_import.c
@@ -574,6 +574,7 @@ static BOOL ImportTad(char* file_name, TadWriteOption option)
 	OSThread thread;
 	BOOL ret = FALSE;
 	s32  nam_result;
+	BOOL overwrite = FALSE;
 
 	// フルパスを作成
 	MakeFullPathForSD(file_name, full_path);
@@ -585,11 +586,13 @@ static BOOL ImportTad(char* file_name, TadWriteOption option)
 	}
 
 	// NANDの情報を取得
-	if ( option != TAD_WRITE_OPTION_OVERWRITE && NAM_ReadTitleInfo(&titleInfoTmp, tadInfo.titleInfo.titleId) == NAM_OK)
+	if ( option != TAD_WRITE_OPTION_OVERWRITE && NAM_ReadTitleInfo(&titleInfoTmp, tadInfo.titleInfo.titleId) == NAM_OK )
 	{
 		// NANDに既にインストールされているかどうか確認する
 		if (tadInfo.titleInfo.titleId == titleInfoTmp.titleId)
 		{
+			overwrite = TRUE;
+
 			switch (option)
 			{
 			case TAD_WRITE_OPTION_NONEXISTENT:
@@ -626,16 +629,20 @@ static BOOL ImportTad(char* file_name, TadWriteOption option)
 	// freeSoftBoxCountに空きがなければインポートしない
 	if (!(tadInfo.titleInfo.titleId & (TITLE_ID_NOT_LAUNCH_FLAG_MASK | TITLE_ID_DATA_ONLY_FLAG_MASK)))
 	{
-		u8 installed, free;
-		if (!NAMUT_GetSoftBoxCount( &installed, &free ))
+		// 上書きインポートの場合はfreeSoftBoxCountはチェックしない
+		if (!overwrite)
 		{
-			return FALSE;
-		}
+			u8 installed, free;
+			if (!NAMUT_GetSoftBoxCount( &installed, &free ))
+			{
+				return FALSE;
+			}
 
-		if (free == 0)
-		{
-			kamiFontPrintfConsole(1, "NAND FreeSoftBoxCount == 0");
-			return FALSE;
+			if (free == 0)
+			{
+				kamiFontPrintfConsole(1, "NAND FreeSoftBoxCount == 0");
+				return FALSE;
+			}
 		}
 	}