ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

This commit is contained in:
squall-leonhart 2011-06-13 15:46:20 +00:00
parent 8e6a51211e
commit a236fff312
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/win32/Reg.cpp
View File

@ -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" );
}
}

4
src/win32/VBA.cpp
View File

@ -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));

2
src/wx/opts.cpp
View File

@ -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()
{