From b39f9ef9e499c8437ae8f3cc1a04d75bc605560e Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Sun, 25 Sep 2016 22:09:13 +0000
Subject: [PATCH] fix bugs in MC import. I dont want to talk about it.

---
 desmume/src/emufile.h |  1 +
 desmume/src/mc.cpp    | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/desmume/src/emufile.h b/desmume/src/emufile.h
index b2b3474cc..3c9bf2d4f 100644
--- a/desmume/src/emufile.h
+++ b/desmume/src/emufile.h
@@ -280,6 +280,7 @@ private:
 	{
 		mPositionCacheEnabled = false;
 		mCondition = eCondition_Clean;
+		mFilePosition = 0;
 		fp = fopen(fname,mode);
 		if(!fp)
 			failbit = true;
diff --git a/desmume/src/mc.cpp b/desmume/src/mc.cpp
index 2ddae7b26..973eb95de 100644
--- a/desmume/src/mc.cpp
+++ b/desmume/src/mc.cpp
@@ -294,7 +294,9 @@ BackupDevice::BackupDevice()
 						else
 						{
 							printf("BackupDevice: Converting old raw .sav file.\n");
-							sz = trim(buf, sz);
+							//dont TRIM this! it will wreck the searchFileSaveType below.
+							//was this intended for egregiously over-sized save files? too bad.
+							//sz = trim(buf, sz);
 						}
 
 						if (fpOut->fwrite(buf, sz) == sz)
@@ -305,6 +307,7 @@ BackupDevice::BackupDevice()
 								info.type = (res + 1);
 								addr_size = info.addr_size = save_types[info.type].addr_size;
 								info.size = fsize = sz;
+								fpMC = fpOut; //so ensure() works
 								ensure(sz, fpOut);
 								fsize = 0;
 							}
@@ -1069,8 +1072,10 @@ bool BackupDevice::importData(const char *filename, u32 force_size)
 	bool res = false;
 	if (strlen(filename) < 4) return res;
 
-	if ((memcmp(filename + strlen(filename) - 4, ".duc", 4) == 0) ||
-		(memcmp(filename + strlen(filename) - 4, ".dss", 4) == 0))
+	std::string ext = strright(filename,4);
+	bool isDuc = strncasecmp(ext.c_str(), ".duc", 4) == 0;
+	bool isDss = strncasecmp(ext.c_str(), ".dss", 4) == 0;
+	if(isDuc || isDss)
 		res = import_duc(filename, force_size);
 	else
 		if (import_no_gba(filename, force_size))