mirror of
https://github.com/nillerusr/source-engine.git
synced 2024-12-22 14:16:50 +00:00
launcher: multirun should work on POSIX now
This commit is contained in:
parent
db6a9839fe
commit
88418ebb4d
@ -1278,6 +1278,10 @@ DLL_EXPORT int LauncherMain( int argc, char **argv )
|
|||||||
// Figure out the directory the executable is running from
|
// Figure out the directory the executable is running from
|
||||||
UTIL_ComputeBaseDir();
|
UTIL_ComputeBaseDir();
|
||||||
|
|
||||||
|
// 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.
|
||||||
|
bool multiRun = CommandLine()->CheckParm( "-multirun" ) != NULL;
|
||||||
|
|
||||||
#if defined( _X360 )
|
#if defined( _X360 )
|
||||||
bool bSpewDllInfo = CommandLine()->CheckParm( "-dllinfo" );
|
bool bSpewDllInfo = CommandLine()->CheckParm( "-dllinfo" );
|
||||||
bool bWaitForConsole = CommandLine()->CheckParm( "-vxconsole" );
|
bool bWaitForConsole = CommandLine()->CheckParm( "-vxconsole" );
|
||||||
@ -1389,10 +1393,6 @@ DLL_EXPORT int LauncherMain( int argc, char **argv )
|
|||||||
// Can only run one windowed source app at a time
|
// Can only run one windowed source app at a time
|
||||||
if ( !GrabSourceMutex() )
|
if ( !GrabSourceMutex() )
|
||||||
{
|
{
|
||||||
// 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.
|
|
||||||
bool multiRun = CommandLine()->CheckParm( "-multirun" ) != NULL;
|
|
||||||
|
|
||||||
// We're going to hijack the existing session and load a new savegame into it. This will mainly occur when users click on links in Bugzilla that will automatically copy saves and load them
|
// We're going to hijack the existing session and load a new savegame into it. This will mainly occur when users click on links in Bugzilla that will automatically copy saves and load them
|
||||||
// directly from the web browser. The -hijack command prevents the launcher from objecting that there is already an instance of the game.
|
// directly from the web browser. The -hijack command prevents the launcher from objecting that there is already an instance of the game.
|
||||||
if (CommandLine()->CheckParm( "-hijack" ))
|
if (CommandLine()->CheckParm( "-hijack" ))
|
||||||
@ -1443,7 +1443,7 @@ DLL_EXPORT int LauncherMain( int argc, char **argv )
|
|||||||
#elif defined( POSIX )
|
#elif defined( POSIX )
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ( !GrabSourceMutex() )
|
if ( !GrabSourceMutex() && !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