From cf987d255de0af315a1a8b3a3fe9e644c78020fc Mon Sep 17 00:00:00 2001
From: LPFaint99 <lpfaint99@gmail.com>
Date: Thu, 11 Dec 2008 06:20:39 +0000
Subject: [PATCH] Memcardmanager fixes. Fix for missing return values in switch
 statement, fix for return value from importfile

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1498 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DolphinWX/Src/MemcardManager.cpp  | 34 +++++++++++++++++++
 .../DolphinWX/Src/MemoryCards/GCMemcard.cpp   | 16 ++++-----
 .../DolphinWX/Src/MemoryCards/GCMemcard.h     |  1 +
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp
index b12c02f986..28637d7039 100644
--- a/Source/Core/DolphinWX/Src/MemcardManager.cpp
+++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp
@@ -510,6 +510,22 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 				memoryCard[SLOT_A]->Save();
 				ReloadMemcard(m_MemcardPath_A->GetPath().mb_str(), SLOT_A, FIRSTPAGE);
 				break;
+			case TITLEPRESENT:
+				wxMessageBox(wxT("Memcard already has a save for this title"),
+						wxT("Error"), wxOK|wxICON_ERROR);
+				break;
+			case INVALIDFILESIZE:
+				wxMessageBox(wxT("The save you are trying to copy has an invalid file size"),
+					wxT("Error"), wxOK|wxICON_ERROR);
+			case OUTOFBLOCKS:
+				blocksOpen.Printf(wxT("Only %d blocks available"), memoryCard[slot]->GetFreeBlocks());
+				wxMessageBox(blocksOpen, wxT("Error"), wxOK|wxICON_ERROR);
+				break;
+			case OUTOFDIRENTRIES:
+				wxMessageBox(wxT("No free dir index entries"),
+					wxT("Error"), wxOK|wxICON_ERROR);
+			default:
+				wxMessageBox(wxEmptyString, wxT("Error"), wxOK|wxICON_ERROR);
 			}
 
 		}
@@ -535,6 +551,24 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 				memoryCard[SLOT_B]->Save();
 				ReloadMemcard(m_MemcardPath_B->GetPath().mb_str(), SLOT_B, FIRSTPAGE);
 				break;
+			case TITLEPRESENT:
+				wxMessageBox(wxT("Memcard already has a save for this title"),
+						wxT("Error"), wxOK|wxICON_ERROR);
+				break;
+			case INVALIDFILESIZE:
+				wxMessageBox(wxT("The save you are trying to copy has an invalid file size"),
+					wxT("Error"), wxOK|wxICON_ERROR);
+				break;
+			case OUTOFBLOCKS:
+				blocksOpen.Printf(wxT("Only %d blocks available"), memoryCard[slot]->GetFreeBlocks());
+				wxMessageBox(blocksOpen, wxT("Error"), wxOK|wxICON_ERROR);
+				break;
+			case OUTOFDIRENTRIES:
+				wxMessageBox(wxT("No free dir index entries"),
+					wxT("Error"), wxOK|wxICON_ERROR);
+				break;
+			default:
+				wxMessageBox(wxEmptyString, wxT("Error"), wxOK|wxICON_ERROR);
 			}
 		}
 		else
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
index e41e964a3e..2ec97954c5 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
+++ b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
@@ -305,7 +305,7 @@ u32  GCMemcard::ImportFile(DEntry& direntry, u8* contents, int remove)
 		FixChecksums();
 		Save();
 	}
-	return fileBlocks;
+	return SUCCESS;
 }
 
 u32 GCMemcard::GetFileData(u32 index, u8* dest, bool old) //index in the directory array
@@ -665,10 +665,10 @@ u32 GCMemcard::CopyFrom(GCMemcard& source, u32 index)
 	if (!mcdFile) return NOMEMCARD;
 
 	DEntry d;
-	if (!source.GetFileInfo(index, d)) return 0;
+	if (!source.GetFileInfo(index, d)) return NOMEMCARD;
 	
 	u32 size = source.GetFileSize(index);
-	if (size == 0xFFFF) return 0;
+	if (size == 0xFFFF) return INVALIDFILESIZE;
 	u8 *t = new u8[size * 0x2000];
 
 	switch (source.GetFileData(index, t, true))
@@ -680,14 +680,10 @@ u32 GCMemcard::CopyFrom(GCMemcard& source, u32 index)
 		delete[] t;
 		return NOMEMCARD;
 	default:
-		break;
+		u32 ret = ImportFile(d,t,0);
+		delete[] t;
+		return ret;
 	}
-
-	u32 ret = ImportFile(d,t,0);
-
-	delete[] t;
-
-	return ret;
 }
 
 s32 GCMemcard::ImportGci(const char *fileName, std::string fileName2)
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h
index 61d7f06749..00dec76232 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h
+++ b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h
@@ -44,6 +44,7 @@ enum
 	OUTOFDIRENTRIES,
 	NOMEMCARD,
 	NOFILE,
+	INVALIDFILESIZE,
 	TITLEPRESENT,
 	SUCCESS = 0x2000,
 	FAIL,