From 4afafaac6dbfc3e083e3602f20301cacf31da6b5 Mon Sep 17 00:00:00 2001 From: Misutaa Asriel <8140068+MisutaaAsriel@users.noreply.github.com> Date: Tue, 22 Feb 2022 15:37:48 -0600 Subject: [PATCH] UI: Fix unorthodox macOS Dock icon behavior 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. --- UI/obs-app.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp index 74cccaa45..1eac7f7e9 100644 --- a/UI/obs-app.cpp +++ b/UI/obs-app.cpp @@ -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