From 39414012b19d661d73666b88c843b05d528a6a48 Mon Sep 17 00:00:00 2001
From: ansstuff <ansstuff@users.sf.net>
Date: Tue, 9 Oct 2012 15:17:20 +0000
Subject: [PATCH] * win32: fixed fceux.cfg loading bug caused by r2689 *
 Taseditor: straighten out pause_frame logic (seriously)

---
 src/drivers/win/main.cpp               | 13 ++++++-------
 src/drivers/win/taseditor/playback.cpp |  2 +-
 vc/deploy.bat                          |  1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/drivers/win/main.cpp b/src/drivers/win/main.cpp
index 7b3960b6..d6040837 100644
--- a/src/drivers/win/main.cpp
+++ b/src/drivers/win/main.cpp
@@ -641,6 +641,11 @@ int main(int argc,char *argv[])
 	// Get the base directory
 	GetBaseDirectory();
 
+	// load fceux.cfg
+	sprintf(TempArray,"%s\\%s",BaseDirectory.c_str(),cfgFile.c_str());
+	LoadConfig(TempArray);
+	//initDirectories();
+
 	// Parse the commandline arguments
 	t = ParseArgies(argc, argv);
 
@@ -648,8 +653,8 @@ int main(int argc,char *argv[])
 
 	if (ConfigToLoad)
 	{
+		// alternative config file specified
 		cfgFile.assign(ConfigToLoad);
-		//initDirectories();
 		// Load the config information
 		sprintf(TempArray,"%s\\%s",BaseDirectory.c_str(),cfgFile.c_str());
 		LoadConfig(TempArray);
@@ -679,12 +684,6 @@ int main(int argc,char *argv[])
 		FCEUI_SetPCMVolume(soundPCMvol);
 	}
 
-	if (!ConfigToLoad)
-	{
-		sprintf(TempArray,"%s\\%s",BaseDirectory.c_str(),cfgFile.c_str());
-		LoadConfig(TempArray);
-	}
-
 	//Since a game doesn't have to be loaded before the GUI can be used, make
 	//sure the temporary input type variables are set.
 	ParseGIInput(NULL);
diff --git a/src/drivers/win/taseditor/playback.cpp b/src/drivers/win/taseditor/playback.cpp
index fdbbdc90..16a8b91d 100644
--- a/src/drivers/win/taseditor/playback.cpp
+++ b/src/drivers/win/taseditor/playback.cpp
@@ -312,7 +312,7 @@ void PLAYBACK::MiddleButtonClick()
 					jump(selection_beginning);
 					SeekingStart(saved_currFrameCounter);
 				}
-			} else if (GetLostPosition() > currFrameCounter && greenzone.SavestateIsEmpty(GetLostPosition()))
+			} else if (GetLostPosition() >= greenzone.GetSize())
 			{
 				RestorePosition();
 			} else
diff --git a/vc/deploy.bat b/vc/deploy.bat
index 96175153..89c9e2c5 100644
--- a/vc/deploy.bat
+++ b/vc/deploy.bat
@@ -1,2 +1,3 @@
+call SubWCRev.bat
 call archive.bat
 call upload.bat %1
\ No newline at end of file