jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Add --multi flag to suppress multi-instance warning

Browse Source 
Addresses Mantis issue 927 by adding the --multi/-m flag to suppress the
warning dialog.

Closes jp9000/obs-studio#964
This commit is contained in:
derrod
2017-07-14 17:49:47 +02:00
committed by jp9000
parent 609334e427
commit c354551484
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
UI/obs-app.cpp
View File

@@ -62,6 +62,7 @@ static string currentLogFile;
static string lastLogFile;
bool portable_mode = false;
static bool multi = false;
static bool log_verbose = false;
static bool unfiltered_log = false;
bool opt_start_streaming = false;
@@ -1348,7 +1349,7 @@ static int run_program(fstream &logFile, int argc, char *argv[])
bool already_running = false;
RunOnceMutex rom = GetRunOnceMutex(already_running);
if (already_running) {
if (already_running && !multi) {
blog(LOG_WARNING, "\n================================");
blog(LOG_WARNING, "Warning: OBS is already running!");
blog(LOG_WARNING, "================================\n");
@@ -1376,6 +1377,10 @@ static int run_program(fstream &logFile, int argc, char *argv[])
blog(LOG_WARNING, "User is now running a secondary "
"instance of OBS!");
} else if (already_running && multi) {
blog(LOG_INFO, "User enabled --multi flag and is now "
"running multiple instances of OBS.");
}
/* --------------------------------------- */
@@ -1856,6 +1861,9 @@ int main(int argc, char *argv[])
if (arg_is(argv[i], "--portable", "-p")) {
portable_mode = true;
} else if (arg_is(argv[i], "--multi", "-m")) {
multi = true;
} else if (arg_is(argv[i], "--verbose", nullptr)) {
log_verbose = true;
@@ -1904,7 +1912,8 @@ int main(int argc, char *argv[])
"--scene <string>: Start with specific scene.\n\n" <<
"--studio-mode: Enable studio mode.\n" <<
"--minimize-to-tray: Minimize to system tray.\n" <<
"--portable, -p: Use portable mode.\n\n" <<
"--portable, -p: Use portable mode.\n" <<
"--multi, -m: Don't warn when launching multiple instances.\n\n" <<
"--verbose: Make log more verbose.\n" <<
"--always-on-top: Start in 'always on top' mode.\n\n" <<
"--unfiltered_log: Make log unfiltered.\n\n" <<