From b7219295956613aba077e231596770bc1d27f2aa Mon Sep 17 00:00:00 2001
From: dormito <dormito@users.sf.net>
Date: Sun, 19 Dec 2010 21:20:12 +0000
Subject: [PATCH] adjusted ini file location to ensure that is in the same path
 as the executable

---
 desmume/src/wx/wxMain.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/desmume/src/wx/wxMain.cpp b/desmume/src/wx/wxMain.cpp
index 0de9a01e5..cd7c30d5b 100644
--- a/desmume/src/wx/wxMain.cpp
+++ b/desmume/src/wx/wxMain.cpp
@@ -71,8 +71,9 @@ bool Desmume::OnInit()
 	OpenConsole();
 #endif
 
-	SetAppName(_T("desmume"));
-	wxConfigBase *pConfig = new wxFileConfig(wxEmptyString,wxEmptyString,_T("desmume.ini"),wxEmptyString,wxCONFIG_USE_RELATIVE_PATH);
+	SetAppName(_T("desmume")); 
+	wxString iniFileName = wxPathOnly(wxStandardPaths::Get().GetExecutablePath()) + "\\desmume.ini";
+	wxConfigBase *pConfig = new wxFileConfig(wxEmptyString,wxEmptyString,iniFileName,wxEmptyString,wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_RELATIVE_PATH);
 	wxConfigBase::Set(pConfig);
 	wxString emu_version(EMU_DESMUME_NAME_AND_VERSION(), wxConvUTF8);
 	DesmumeFrame *frame = new DesmumeFrame(emu_version);