From 919c5fb7a87109298f404cb5475fde121dbe4a48 Mon Sep 17 00:00:00 2001
From: squall-leonhart <squall-leonhart@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Mon, 13 Jun 2011 15:46:20 +0000
Subject: [PATCH] apply the vba config file rename to the trunk, this has come
 about because older versions use some values slightly differently which would
 cause those versions to fail to work or have the wrong settings.

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1023 a31d4220-a93d-0410-bf67-fe4944624d44
---
 src/win32/Reg.cpp | 6 +++---
 src/win32/VBA.cpp | 4 ++--
 src/wx/opts.cpp   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/win32/Reg.cpp b/src/win32/Reg.cpp
index 2d36578a..cbb248ef 100644
--- a/src/win32/Reg.cpp
+++ b/src/win32/Reg.cpp
@@ -29,15 +29,15 @@ void regInit(const char *path, bool force)
 	  regVbaPath = NULL;
   }
 
-  // If vba.ini exists in executable's folder, use it. Else create/use one in %appdata% folder.
+  // If vbam.ini exists in executable's folder, use it. Else create/use one in %appdata% folder.
   regVbaPath = new CString();
-  regVbaPath->Format(MakeInstanceFilename("%s\\vba.ini"), path);
+  regVbaPath->Format(MakeInstanceFilename("%s\\vbam.ini"), path);
   if( !force && !utilFileExists( regVbaPath->GetString() ) ) {
 	  TCHAR appdata[MAX_PATH+1];
 	  SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata );
 	  regVbaPath->Format( "%s\\VBA-M", appdata );
 	  SHCreateDirectoryEx( NULL, regVbaPath->GetString(), NULL );
-	  regVbaPath->Append( "\\vba.ini" );
+	  regVbaPath->Append( "\\vbam.ini" );
   }
 }
 
diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp
index 7d8fdbe8..4aac89ae 100644
--- a/src/win32/VBA.cpp
+++ b/src/win32/VBA.cpp
@@ -429,12 +429,12 @@ BOOL VBA::InitInstance()
   systemVerbose = GetPrivateProfileInt("config",
                                        "verbose",
                                        0,
-                                       MakeInstanceFilename("VBA.ini"));
+                                       MakeInstanceFilename("vbam.ini"));
 
   systemDebug = GetPrivateProfileInt("config",
                                      "debug",
                                      0,
-                                     MakeInstanceFilename("VBA.ini"));
+                                     MakeInstanceFilename("vbam.ini"));
 
   wndClass = AfxRegisterWndClass(0, LoadCursor(IDC_ARROW), (HBRUSH)GetStockObject(BLACK_BRUSH), LoadIcon(IDI_MAINICON));
 
diff --git a/src/wx/opts.cpp b/src/wx/opts.cpp
index 2e7e872e..4928a578 100644
--- a/src/wx/opts.cpp
+++ b/src/wx/opts.cpp
@@ -286,7 +286,7 @@ bool opt_lt(const opt_desc &opt1, const opt_desc &opt2)
     return wxStrcmp(opt1.opt, opt2.opt) < 0;
 }
 
-// FIXME: simulate MakeInstanceFilename(VBA.ini) using subkeys (Slave%d/*)
+// FIXME: simulate MakeInstanceFilename(vbam.ini) using subkeys (Slave%d/*)
 
 void load_opts()
 {