mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-19 20:32:15 +02:00
UI: Don't modify theme if already set
This includes reselecting the existing selection, and cancelling out of settings altogether. Takes a long time (7 seconds) in debug builds.
This commit is contained in:
parent
5d5afc463f
commit
bb04c961bc
@ -3509,7 +3509,8 @@ void OBSBasicSettings::on_theme_activated(int idx)
|
||||
if (currT == defaultTheme)
|
||||
currT = DEFAULT_THEME;
|
||||
|
||||
App()->SetTheme(currT.toUtf8().constData());
|
||||
if (currT != App()->GetTheme())
|
||||
App()->SetTheme(currT.toUtf8().constData());
|
||||
}
|
||||
|
||||
void OBSBasicSettings::on_listWidget_itemSelectionChanged()
|
||||
@ -3535,7 +3536,8 @@ void OBSBasicSettings::on_buttonBox_clicked(QAbstractButton *button)
|
||||
if (val == QDialogButtonBox::AcceptRole ||
|
||||
val == QDialogButtonBox::RejectRole) {
|
||||
if (val == QDialogButtonBox::RejectRole) {
|
||||
App()->SetTheme(savedTheme);
|
||||
if (savedTheme != App()->GetTheme())
|
||||
App()->SetTheme(savedTheme);
|
||||
#ifdef _WIN32
|
||||
if (toggleAero)
|
||||
SetAeroEnabled(!aeroWasDisabled);
|
||||
|
Loading…
Reference in New Issue
Block a user