From ae0e3a5db4a285c5e7ca42850557d633292642d2 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Thu, 7 Aug 2008 04:10:41 +0000
Subject: [PATCH] SF case 2040448  View Slots bug - does not include new
 savestate naming

---
 changelog.txt | 2 ++
 src/fceu.cpp  | 1 -
 src/file.cpp  | 8 --------
 src/state.cpp | 1 +
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 77d01fb2..d1dbcc6e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,7 @@
 ---version 2.0.2 released---
 
+06-aug-2008 - zeromus - SF case 2040448  (View Slots bug - does not include new savestate naming)
+06-aug-2008 - zeromus - restore the debugger snap functionality
 06-aug-2008 - zeromus - add memory.readbyterange to emulua
 06-aug-2008 - zeromus - auto-fill .fcs extension in save state as dialog
 06-aug-2008 - zeromus - mmc5 - 64KB games now work correctly
diff --git a/src/fceu.cpp b/src/fceu.cpp
index 3cd5f729..6c40aadf 100644
--- a/src/fceu.cpp
+++ b/src/fceu.cpp
@@ -407,7 +407,6 @@ endlseq:
 			OpenGenie();
 	PowerNES();
 
-	FCEUSS_CheckStates();
 	if(GameInfo->type!=GIT_NSF)
 		FCEU_LoadGamePalette();
 
diff --git a/src/file.cpp b/src/file.cpp
index a96a3492..eb374dd6 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -421,14 +421,6 @@ void FCEUI_SetDirOverride(int which, char *n)
 	{
 		odirs[which] = n;
 	}
-
-	if(GameInfo)  //Rebuild cache of present states/movies. 
-	{
-		if(which==FCEUIOD_STATES)
-		{
-			FCEUSS_CheckStates();
-		}
-	}
 }
 
 	#ifndef HAVE_ASPRINTF
diff --git a/src/state.cpp b/src/state.cpp
index 8286d04f..1402586a 100644
--- a/src/state.cpp
+++ b/src/state.cpp
@@ -635,6 +635,7 @@ void FCEUI_SelectStateNext(int n)
 
 int FCEUI_SelectState(int w, int show)
 {
+	FCEUSS_CheckStates();
 	int oldstate=CurrentState;
 	if(w == -1) { StateShow = 0; return 0; } //mbg merge 7/17/06 had to make return a value