GCMemcard: Initialize the current/previous DIR BAT pointers when crea…

…ting a new memory card fixes issue 6288
dolphin-emu · May 1, 2013 · c80309e · c80309e
1 parent 8bcd9a7
commit c80309e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp
@@ -215,7 +215,12 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis)
 	}
 
 	mcdFile.Close();
+
+	initDirBatPointers();
+}
 
+void GCMemcard::initDirBatPointers() 
+{
 	if (BE16(dir.UpdateCounter) > (BE16(dir_backup.UpdateCounter)))
 	{
 		CurrentDir = &dir;
@@ -1273,7 +1278,8 @@ bool GCMemcard::Format(bool sjis, u16 SizeMb)
 		GCMBlock b;
 		mc_data_blocks.push_back(b);
 	}
-
+
+	initDirBatPointers();
 	m_valid = true;
 
 	return Save();

diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h
@@ -171,6 +171,7 @@ class GCMemcard : NonCopyable
 
 	u32 ImportGciInternal(FILE* gcih, const char *inputFile, const std::string &outputFile);
 	static void FormatInternal(GCMC_Header &GCP);
+	void initDirBatPointers() ;
 public:
 
 	GCMemcard(const char* fileName, bool forceCreation=false, bool sjis=false);