opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix unorthodox macOS Dock icon behavior

Browse Source 
Fixes overriding of macOS dock icon behavior.

macOS sets the icon on launch based on:
- The Information PLIST
- A user provided icon by Finder

setWindowIcon overrides this behavior.

Therefore, this commit resolves this issue,
by doing nothing if target is macOS.
This commit is contained in:
Misutaa Asriel
2022-03-08 08:50:34 -08:00
committed by Jim
parent ec05e1ff57
commit 4afafaac6d
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/obs-app.cpp
+1 -4
View File
@@ -1164,10 +1164,7 @@ OBSApp::OBSApp(int &argc, char **argv, profiler_name_store_t *store)
sleepInhibitor = os_inhibit_sleep_create("OBS Video/audio");
#ifdef __APPLE__
setWindowIcon(
QIcon::fromTheme("obs", QIcon(":/res/images/obs_256x256.png")));
#else
#ifndef __APPLE__
setWindowIcon(QIcon::fromTheme("obs", QIcon(":/res/images/obs.png")));
#endif