starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-24 10:14:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fixup ResolveVariable to be less jank

Browse Source
This commit is contained in:
derrod
2024-08-17 16:05:26 -07:00
committed by Lain
parent 7c85253667
commit 418c9b87cf
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/obs-app-theming.cpp
+8 -11
View File
@@ -511,25 +511,22 @@ void OBSApp::FindThemes()
static bool ResolveVariable(const QHash<QString, OBSThemeVariable> &vars,
OBSThemeVariable &var)
{
const OBSThemeVariable *varPtr = &var;
const OBSThemeVariable *realVar = varPtr;
if (var.type != OBSThemeVariable::Alias)
return true;
while (realVar->type == OBSThemeVariable::Alias) {
QString newKey = realVar->value.toString();
QString key = var.value.toString();
while (vars[key].type == OBSThemeVariable::Alias) {
key = vars[key].value.toString();
if (!vars.contains(newKey)) {
if (!vars.contains(key)) {
blog(LOG_ERROR,
R"(Variable "%s" (aliased by "%s") does not exist!)",
QT_TO_UTF8(newKey), QT_TO_UTF8(var.name));
QT_TO_UTF8(key), QT_TO_UTF8(var.name));
return false;
}
const OBSThemeVariable &newVar = vars[newKey];
realVar = &newVar;
}
if (realVar != varPtr)
var = *realVar;
var = vars[key];
return true;
}