From c2d824d24a2fac91414bc9388e686f7521c8dcdc Mon Sep 17 00:00:00 2001
From: dborth <dborth@0aaa047c-bd49-0410-9b25-49477284f1fd>
Date: Sat, 10 Apr 2010 06:36:58 +0000
Subject: [PATCH]

---
 hbc/meta.xml           | 2 +-
 readme.txt             | 6 +++++-
 source/fceugx.h        | 2 +-
 source/filebrowser.cpp | 9 ++++-----
 update.xml             | 4 ++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/hbc/meta.xml b/hbc/meta.xml
index 6fd0c67..733782b 100644
--- a/hbc/meta.xml
+++ b/hbc/meta.xml
@@ -2,7 +2,7 @@
 <app version="1">
   <name>FCE Ultra GX</name>
   <coder>Tantric</coder>
-  <version>3.1.5</version>
+  <version>3.1.6</version>
   <release_date>20100409</release_date>
   <short_description>Nintendo Emulator</short_description>
   <long_description>A port of FCE Ultra to the Wii.</long_description>
diff --git a/readme.txt b/readme.txt
index 3897519..bc570cd 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,7 @@
 ¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤
  
                                  - FCE Ultra GX -
-                                  Version 3.1.5
+                                  Version 3.1.6
                          http://code.google.com/p/fceugc   
                                (Under GPL License)
  
@@ -33,6 +33,10 @@ Wii/GameCube.
 |0O×øo·                         UPDATE HISTORY                        ·oø×O0|
 `¨•¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨'
 
+[3.1.6 - April 9, 2010]
+
+* Fix auto-save bug
+
 [3.1.5 - April 9, 2010]
 
 * Most 3rd party controllers should work now (you're welcome!)
diff --git a/source/fceugx.h b/source/fceugx.h
index 3e2a5a7..778c71c 100644
--- a/source/fceugx.h
+++ b/source/fceugx.h
@@ -17,7 +17,7 @@
 #include "fceultra/driver.h"
 
 #define APPNAME			"FCE Ultra GX"
-#define APPVERSION		"3.1.5"
+#define APPVERSION		"3.1.6"
 #define APPFOLDER 		"fceugx"
 #define PREF_FILE_NAME	"settings.xml"
 
diff --git a/source/filebrowser.cpp b/source/filebrowser.cpp
index 69cada6..5454ce3 100644
--- a/source/filebrowser.cpp
+++ b/source/filebrowser.cpp
@@ -510,6 +510,10 @@ int BrowserLoadFile()
 	}
 	else
 	{
+		// store the filename (w/o ext) - used for ram/state naming
+		StripExt(romFilename, browserList[browser.selIndex].filename);
+		strcpy(loadedFile, browserList[browser.selIndex].filename);
+		
 		// load UPS/IPS/PPF patch
 		filesize = LoadPatch(filesize);
 
@@ -524,11 +528,6 @@ int BrowserLoadFile()
 				LoadStateAuto(SILENT);
 
 			ResetNES();
-
-			// store the filename (w/o ext) - used for ram/state naming
-			StripExt(romFilename, browserList[browser.selIndex].filename);
-			strcpy(loadedFile, browserList[browser.selIndex].filename);
-
 			ResetBrowser();
 		}
 	}
diff --git a/update.xml b/update.xml
index 96e6d7f..510cdc9 100644
--- a/update.xml
+++ b/update.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<app version="3.1.5">
-<file url="http://fceugc.googlecode.com/files/FCE%20Ultra%20GX%203.1.5.zip"></file>
+<app version="3.1.6">
+<file url="http://fceugc.googlecode.com/files/FCE%20Ultra%20GX%203.1.6.zip"></file>
 </app>