lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 24.0.6+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2019-12-24 10:07:22 +01:00
parent 4c2ea24267
commit 04fe0efc67
10 changed files with 42 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

22
UI/obs-app.cpp
View file

@ -1059,21 +1059,27 @@ bool OBSApp::InitTheme()
defaultPalette = palette();
const char *themeName =
config_get_string(globalConfig, "General", "CurrentTheme");
config_get_string(globalConfig, "General", "CurrentTheme2");
if (!themeName) {
if (!themeName)
/* Use deprecated "CurrentTheme" value if available */
themeName = config_get_string(globalConfig, "General",
"CurrentTheme");
if (!themeName)
/* Use deprecated "Theme" value if available */
themeName = config_get_string(globalConfig, "General", "Theme");
if (!themeName)
themeName = DEFAULT_THEME;
if (!themeName)
themeName = "Dark";
}
if (!themeName)
themeName = DEFAULT_THEME;
if (!themeName)
themeName = "Dark";
if (strcmp(themeName, "Default") == 0)
themeName = "System";
return SetTheme(themeName);
if (strcmp(themeName, "System") != 0 && SetTheme(themeName))
return true;
return SetTheme("System");
}
OBSApp::OBSApp(int &argc, char **argv, profiler_name_store_t *store)

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());

2
UI/window-extra-browsers.cpp
View file

@ -536,7 +536,7 @@ void OBSBasic::AddExtraBrowserDock(const QString &title, const QString &url,
/* Add support for Twitch Dashboard panels */
if (url.contains("twitch.tv/popout") &&
url.contains("dashboard/live")) {
QRegularExpression re("twitch.tv\/popout\/([^/]+)\/");
QRegularExpression re("twitch.tv\\/popout\\/([^/]+)\\/");
QRegularExpressionMatch match = re.match(url);
QString username = match.captured(1);
if (username.length() > 0) {