4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Ensure OBS launches when theme is missing

Browse source 
This change makes it so OBS will still launch even if a theme is
missing. This change also deprecates the "CurrentTheme" config key, and
is replaced by "CurrentTheme2".

This is because a previous change to make sure OBS fell back to the
System theme in case of a missing theme had been accidentally removed.
Changing the key prevents a new version of OBS setting a theme that
doesn't exist in an older version, which would prevent that version from
launching.
This commit is contained in:
VodBox 2019-12-15 11:24:34 +13:00 • committed by jp9000
commit f782acb66d
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
UI/window-basic-settings.cpp
View file

@ -2726,7 +2726,7 @@ void OBSBasicSettings::SaveGeneralSettings()
themeData = DEFAULT_THEME;
if (WidgetChanged(ui->theme)) {
config_set_string(GetGlobalConfig(), "General", "CurrentTheme",
config_set_string(GetGlobalConfig(), "General", "CurrentTheme2",
QT_TO_UTF8(themeData));
App()->SetTheme(themeData.toUtf8().constData());