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

UI: Detect other instances of obs on macOS

Browse Source 
Detect other instances of the obs by inspecting running applications
with same bundle ID.

fixes: #3053
This commit is contained in:
Mikhail Kochegarov 2020-10-05 14:48:22 +02:00 committed by Jim
parent 64869bac46
commit 117d35433f
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
UI/obs-app.cpp
View File

@ -1929,13 +1929,17 @@ static int run_program(fstream &logFile, int argc, char *argv[])
OBSTranslator translator; OBSTranslator translator;
program.installTranslator(&translator); program.installTranslator(&translator);
#ifdef _WIN32
/* --------------------------------------- */ /* --------------------------------------- */
/* check and warn if already running */ /* check and warn if already running */
bool cancel_launch = false; bool cancel_launch = false;
bool already_running = false; bool already_running = false;
#if defined(_WIN32)
RunOnceMutex rom = GetRunOnceMutex(already_running); RunOnceMutex rom = GetRunOnceMutex(already_running);
#elif defined(__APPLE__)
CheckAppWithSameBundleID(already_running);
#endif
if (!already_running) { if (!already_running) {
goto run; goto run;
@ -1979,7 +1983,6 @@ static int run_program(fstream &logFile, int argc, char *argv[])
/* --------------------------------------- */ /* --------------------------------------- */
run: run:
#endif
#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__) #if !defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__)
// Mounted by termina during chromeOS linux container startup // Mounted by termina during chromeOS linux container startup

23
UI/platform-osx.mm
View File

@ -87,6 +87,29 @@ bool InitApplicationBundle()
#endif #endif
} }
void CheckAppWithSameBundleID(bool &already_running)
{
try {
NSBundle *bundle = [NSBundle mainBundle];
if (!bundle)
throw "Could not find main bundle";
NSString *bundleID = [bundle bundleIdentifier];
if (!bundleID)
throw "Could not find bundle identifier";
int app_count =
[NSRunningApplication
runningApplicationsWithBundleIdentifier:bundleID]
.count;
already_running = app_count > 1;
} catch (const char *error) {
blog(LOG_ERROR, "CheckAppWithSameBundleID: %s", error);
}
}
string GetDefaultVideoSavePath() string GetDefaultVideoSavePath()
{ {
NSFileManager *fm = [NSFileManager defaultManager]; NSFileManager *fm = [NSFileManager defaultManager];

1
UI/platform.hpp
View File

@ -68,4 +68,5 @@ void EnableOSXVSync(bool enable);
void EnableOSXDockIcon(bool enable); void EnableOSXDockIcon(bool enable);
void InstallNSApplicationSubclass(); void InstallNSApplicationSubclass();
void disableColorSpaceConversion(QWidget *window); void disableColorSpaceConversion(QWidget *window);
void CheckAppWithSameBundleID(bool &already_running);
#endif #endif