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

Use version number for app name

This commit is contained in:
zilmar 2015-02-03 06:25:10 +11:00
parent 200807155d
commit e0cb57c44e
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Project64/main.cpp
View File

@ -168,6 +168,25 @@ bool TerminatedExistingEmu()
return bTerminated; return bTerminated;
} }
const char * AppName ( void )
{
static stdstr Name;
if (Name.empty())
{
stdstr StrVersion(VersionInfo(VERSION_PRODUCT_VERSION));
strvector parts = StrVersion.Tokenize(".");
if (parts.size() == 4)
{
Name = stdstr_f("Project64 %s.%s",parts[0].c_str(),parts[1].c_str());
}
else
{
Name = "Project64";
}
}
return Name.c_str();
}
int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /*lpszArgs*/, int /*nWinMode*/) int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /*lpszArgs*/, int /*nWinMode*/)
{ {
FixDirectories(); FixDirectories();
@ -176,18 +195,17 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /
try try
{ {
SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL ); SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL );
LPCSTR AppName = "Project64 2.0";
_Lang = new CLanguage(); _Lang = new CLanguage();
g_Settings = new CSettings; g_Settings = new CSettings;
g_Settings->Initilize(AppName); g_Settings->Initilize(AppName());
if (g_Settings->LoadBool(Setting_CheckEmuRunning) && if (g_Settings->LoadBool(Setting_CheckEmuRunning) &&
TerminatedExistingEmu()) TerminatedExistingEmu())
{ {
delete g_Settings; delete g_Settings;
g_Settings = new CSettings; g_Settings = new CSettings;
g_Settings->Initilize(AppName); g_Settings->Initilize(AppName());
} }
InitializeLog(); InitializeLog();
@ -206,7 +224,7 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /
//Create the main window with Menu //Create the main window with Menu
WriteTrace(TraceDebug,__FUNCTION__ ": Create Main Window"); WriteTrace(TraceDebug,__FUNCTION__ ": Create Main Window");
stdstr WinTitle(AppName); stdstr WinTitle(AppName());
#ifdef BETA_RELEASE #ifdef BETA_RELEASE
WinTitle.Format("Project64 %s (%s)",VersionInfo(VERSION_PRODUCT_VERSION).c_str(),g_Settings->LoadString(Beta_UserName).c_str()); WinTitle.Format("Project64 %s (%s)",VersionInfo(VERSION_PRODUCT_VERSION).c_str(),g_Settings->LoadString(Beta_UserName).c_str());
#else #else