From 570c904977d71f2d1a5328d7ca9b9c399a254a9e Mon Sep 17 00:00:00 2001 From: Matt Gajownik Date: Mon, 4 Jul 2022 23:00:15 +1000 Subject: [PATCH] UI: Don't re-apply theme when saving Settings When the user changes theme, it is applied immediately. If the user clicks Cancel, the previous theme is restored. This additional SetTheme call was unnecessarily causing the existing theme to be re-applied, resulting in a momentary hang without clear cause. --- UI/window-basic-settings.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 716a931f9..3289f1937 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -3094,13 +3094,10 @@ void OBSBasicSettings::SaveGeneralSettings() if (themeData == defaultTheme) themeData = DEFAULT_THEME; - if (WidgetChanged(ui->theme)) { + if (WidgetChanged(ui->theme)) config_set_string(GetGlobalConfig(), "General", "CurrentTheme2", QT_TO_UTF8(themeData)); - App()->SetTheme(themeData.toUtf8().constData()); - } - #if defined(_WIN32) || defined(__APPLE__) if (WidgetChanged(ui->enableAutoUpdates)) config_set_bool(GetGlobalConfig(), "General",