mirror of
https://github.com/nillerusr/source-engine.git
synced 2024-12-22 14:16:50 +00:00
launcher: don't grab/release mutex if multirun is enabled
This commit is contained in:
parent
88418ebb4d
commit
46fc2b7090
@ -104,6 +104,7 @@ static IEngineAPI *g_pEngineAPI;
|
|||||||
static IHammer *g_pHammer;
|
static IHammer *g_pHammer;
|
||||||
|
|
||||||
bool g_bTextMode = false;
|
bool g_bTextMode = false;
|
||||||
|
bool g_MultiRun = false;
|
||||||
|
|
||||||
static char g_szBasedir[MAX_PATH];
|
static char g_szBasedir[MAX_PATH];
|
||||||
static char g_szGamedir[MAX_PATH];
|
static char g_szGamedir[MAX_PATH];
|
||||||
@ -922,6 +923,9 @@ char g_lockFilename[MAX_PATH];
|
|||||||
#endif
|
#endif
|
||||||
bool GrabSourceMutex()
|
bool GrabSourceMutex()
|
||||||
{
|
{
|
||||||
|
if( g_MultiRun )
|
||||||
|
return true;
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
if ( IsPC() )
|
if ( IsPC() )
|
||||||
{
|
{
|
||||||
@ -1016,6 +1020,9 @@ bool GrabSourceMutex()
|
|||||||
|
|
||||||
void ReleaseSourceMutex()
|
void ReleaseSourceMutex()
|
||||||
{
|
{
|
||||||
|
if( g_MultiRun )
|
||||||
|
return;
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
if ( IsPC() && g_hMutex )
|
if ( IsPC() && g_hMutex )
|
||||||
{
|
{
|
||||||
@ -1280,7 +1287,7 @@ DLL_EXPORT int LauncherMain( int argc, char **argv )
|
|||||||
|
|
||||||
// Allow the user to explicitly say they want to be able to run multiple instances of the source mutex.
|
// Allow the user to explicitly say they want to be able to run multiple instances of the source mutex.
|
||||||
// Useful for side-by-side comparisons of different renderers.
|
// Useful for side-by-side comparisons of different renderers.
|
||||||
bool multiRun = CommandLine()->CheckParm( "-multirun" ) != NULL;
|
g_MultiRun = CommandLine()->CheckParm( "-multirun" ) != NULL;
|
||||||
|
|
||||||
#if defined( _X360 )
|
#if defined( _X360 )
|
||||||
bool bSpewDllInfo = CommandLine()->CheckParm( "-dllinfo" );
|
bool bSpewDllInfo = CommandLine()->CheckParm( "-dllinfo" );
|
||||||
@ -1430,12 +1437,12 @@ DLL_EXPORT int LauncherMain( int argc, char **argv )
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!multiRun) {
|
if (!g_MultiRun) {
|
||||||
::MessageBox(NULL, "Only one instance of the game can be running at one time.", "Source - Warning", MB_ICONINFORMATION | MB_OK);
|
::MessageBox(NULL, "Only one instance of the game can be running at one time.", "Source - Warning", MB_ICONINFORMATION | MB_OK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!multiRun) {
|
if (!g_MultiRun) {
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1443,7 +1450,7 @@ DLL_EXPORT int LauncherMain( int argc, char **argv )
|
|||||||
#elif defined( POSIX )
|
#elif defined( POSIX )
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ( !GrabSourceMutex() && !multiRun )
|
if ( !GrabSourceMutex() && !g_MultiRun )
|
||||||
{
|
{
|
||||||
::MessageBox(NULL, "Only one instance of the game can be running at one time.", "Source - Warning", 0 );
|
::MessageBox(NULL, "Only one instance of the game can be running at one time.", "Source - Warning", 0 );
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user