From 89c87155485fa4071b38f514f3d1c802a4a3f71b Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@users.sf.net>
Date: Mon, 13 Oct 2008 16:09:13 +0000
Subject: [PATCH] replaced instances of "fceux.cfg" with a variable std:string
 cfgFile

---
 src/drivers/common/configSys.cpp | 5 +++--
 src/drivers/win/main.cpp         | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/drivers/common/configSys.cpp b/src/drivers/common/configSys.cpp
index ca18ccb9..79612186 100644
--- a/src/drivers/common/configSys.cpp
+++ b/src/drivers/common/configSys.cpp
@@ -6,6 +6,7 @@
 #include "../../types.h"
 #include "configSys.h"
 
+std::string cfgFile = "fceux.cfg";
 /**
  * Add a given option.  The option is specified as a short command
  * line (-f), long command line (--foo), option name (Foo), its type
@@ -582,7 +583,7 @@ Config::_load()
     std::map<std::string, int>::iterator int_i;
     std::map<std::string, double>::iterator dbl_i;
     std::map<std::string, std::string>::iterator str_i;
-    std::string configFile = _dir + "/fceux.cfg";
+    std::string configFile = _dir + "/" + cfgFile;
     std::string line, name, value;
     char buf[1024];
 
@@ -649,7 +650,7 @@ Config::save()
     std::map<std::string, int>::iterator int_i;
     std::map<std::string, double>::iterator dbl_i;
     std::map<std::string, std::string>::iterator str_i;
-    std::string configFile = _dir + "/fceux.cfg";
+    std::string configFile = _dir + "/" + cfgFile;
     char buf[1024];
 
     // set the exception handling to catch i/o errors
diff --git a/src/drivers/win/main.cpp b/src/drivers/win/main.cpp
index 12c0895d..3239f23c 100644
--- a/src/drivers/win/main.cpp
+++ b/src/drivers/win/main.cpp
@@ -95,7 +95,7 @@
 #endif
 
 // External functions
-
+extern std::string cfgFile;
 void ResetVideo(void);
 void ShowCursorAbs(int w);
 void HideFWindow(int h);
@@ -432,7 +432,8 @@ int DriverInitialize()
 static void DriverKill(void)
 { 
 	// Save config file
-	sprintf(TempArray, "%s/fceux.cfg", BaseDirectory.c_str());
+	//sprintf(TempArray, "%s/fceux.cfg", BaseDirectory.c_str());
+	sprintf(TempArray, "%s/%s", BaseDirectory.c_str(),cfgFile.c_str());
 	SaveConfig(TempArray);
 
 	DestroyInput();
@@ -568,7 +569,8 @@ int main(int argc,char *argv[])
 	GetBaseDirectory();
 
 	// Load the config information
-	sprintf(TempArray,"%s\\fceux.cfg",BaseDirectory.c_str());
+	//sprintf(TempArray,"%s\\fceux.cfg",BaseDirectory.c_str());
+	sprintf(TempArray,"%s\\%s",BaseDirectory.c_str(),cfgFile.c_str());
 	LoadConfig(TempArray);
 
 	initDirectories();