Kaynağa Gözat

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
jp9000 10 yıl önce
ebeveyn
işleme
fddb7d283d
1 değiştirilmiş dosya ile 7 ekleme ve 3 silme
  1. 7 3
      obs/window-basic-settings.cpp

+ 7 - 3
obs/window-basic-settings.cpp

@@ -919,14 +919,18 @@ void OBSBasicSettings::ResetDownscales(uint32_t cx, uint32_t cy)
 	float baseAspect   = float(cx) / float(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);
 	else
 		ui->outputResolution->lineEdit()->setText(bestScale.c_str());
 
 	ui->outputResolution->blockSignals(false);
-	ui->outputResolution->setProperty("changed", QVariant(true));
-	videoChanged = true;
+
+	if (!closeAspect) {
+		ui->outputResolution->setProperty("changed", QVariant(true));
+		videoChanged = true;
+	}
 
 	if (advRescale.isEmpty())
 		advRescale = res.c_str();