jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Fix settings window data always being "changed" 

Fixes a bug introduced in 6407707a04 where if you open the settings
window the settings would always think there were new changes.  It was
marking a control as changed when it shouldn't be
master
jp9000 2016-01-31 15:32:43 -08:00
parent d7880e0ae8
commit fddb7d283d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
obs/window-basic-settings.cpp
View File

@ -919,14 +919,18 @@ void OBSBasicSettings::ResetDownscales(uint32_t cx, uint32_t cy)
float baseAspect = float(cx) / float(cy); float baseAspect = float(cx) / float(cy);
float outputAspect = float(out_cx) / float(out_cy); float outputAspect = float(out_cx) / float(out_cy);
if (close_float(baseAspect, outputAspect, 0.01f)) bool closeAspect = close_float(baseAspect, outputAspect, 0.01f);
if (closeAspect)
ui->outputResolution->lineEdit()->setText(oldOutputRes); ui->outputResolution->lineEdit()->setText(oldOutputRes);
else else
ui->outputResolution->lineEdit()->setText(bestScale.c_str()); ui->outputResolution->lineEdit()->setText(bestScale.c_str());
ui->outputResolution->blockSignals(false); ui->outputResolution->blockSignals(false);
if (!closeAspect) {
ui->outputResolution->setProperty("changed", QVariant(true)); ui->outputResolution->setProperty("changed", QVariant(true));
videoChanged = true; videoChanged = true;
}
if (advRescale.isEmpty()) if (advRescale.isEmpty())
advRescale = res.c_str(); advRescale = res.c_str();