From 13c8810730a02cbfd6084413561570b4075f6b3d Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Wed, 13 Aug 2008 04:47:19 +0000
Subject: [PATCH] fix sdl configfile woes

---
 changelog.txt                    | 1 +
 src/drivers/common/configSys.cpp | 4 ++--
 src/drivers/sdl/config.cpp       | 2 +-
 src/drivers/sdl/sdl.cpp          | 8 ++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index b0bd4cd8..b895188c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,6 @@
 ---version 2.0.2 released---
 
+12-aug-2008 - zeromus - fix SDL configfile woes. configfile now goes to ~/.fceux/fceux.cfg
 12-aug-2008 - zeromus - SF [ 2047986 ] palflag 1 in .fm2 files crashes fceux
 12-aug-2008 - adelikat - movie replay dialog displays fractions of a second
 12-aug-2008 - punkrockguy318 - SDL: fixed segfault when opening .fcm files
diff --git a/src/drivers/common/configSys.cpp b/src/drivers/common/configSys.cpp
index fd36291c..ca18ccb9 100644
--- a/src/drivers/common/configSys.cpp
+++ b/src/drivers/common/configSys.cpp
@@ -582,7 +582,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 + "/fceu.cfg";
+    std::string configFile = _dir + "/fceux.cfg";
     std::string line, name, value;
     char buf[1024];
 
@@ -649,7 +649,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 + "/fceu.cfg";
+    std::string configFile = _dir + "/fceux.cfg";
     char buf[1024];
 
     // set the exception handling to catch i/o errors
diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp
index a65564c5..f33c81c4 100644
--- a/src/drivers/sdl/config.cpp
+++ b/src/drivers/sdl/config.cpp
@@ -80,7 +80,7 @@ GetBaseDirectory(std::string &dir)
 {
     char *home = getenv("HOME");
     if(home) {
-        dir = std::string(home) + "/.fceultra";
+        dir = std::string(home) + "/.fceux";
     } else {
 #ifdef WIN32
         home = new char[MAX_PATH + 1];
diff --git a/src/drivers/sdl/sdl.cpp b/src/drivers/sdl/sdl.cpp
index d1851032..6a1820a2 100644
--- a/src/drivers/sdl/sdl.cpp
+++ b/src/drivers/sdl/sdl.cpp
@@ -7,8 +7,8 @@
 #include <strings.h>
 #include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <iostream>
+#include <stdlib.h>
+#include <iostream>
 #include <fstream>
 
 
@@ -421,13 +421,13 @@ SDL_GL_LoadLibrary(0);
         return -1;
     }
 
-	if(g_config->parse(argc,argv)) {
+	if(g_config->parse(argc,argv)==-1) {
 		printf("Error parsing config file\n");
 		SDL_Quit();
         return -1;
 	}
 	
-	// This is here so that a default fceu.cfg will be created on first
+	// This is here so that a default fceux.cfg will be created on first
 	// run, even without a valid ROM to play.
 	g_config->save();
     // initialize the infrastructure