fix for error messages with memcard manager

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@910 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 2 insertions, 2 deletions

diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
index def1284fb1..f05ab0a9d7 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
+++ b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
@@ -641,7 +641,7 @@ u32  GCMemcard::CopyFrom(GCMemcard& source, u32 index)
 	return ret;

 }

 

-u32  GCMemcard::ImportGci(const char *fileName, const char *fileName2)

+int  GCMemcard::ImportGci(const char *fileName, const char *fileName2)

 {

 	if (!mcdFile && !fileName2) return OPENFAIL;

 

diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h
index cf472e8567..c51bdd849f 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h
+++ b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.h
@@ -170,7 +170,7 @@ public:
 	bool ExportGci(u32 index, const char* fileName);

 

 	// reads a .gci/.gcs/.sav file and calls ImportFile or saves out a gci file

-	u32  ImportGci(const char* fileName, const char* fileName2);

+	int  ImportGci(const char* fileName, const char* fileName2);

 

 	// reads the banner image

 	bool ReadBannerRGBA8(u32 index, u32* buffer);