From 553394c266322e19c17f2a59785eb9b55ccb109e Mon Sep 17 00:00:00 2001
From: Brad Parker <cbparker@gmail.com>
Date: Tue, 14 Aug 2018 21:38:45 -0400
Subject: [PATCH] Qt: fix setting of spinbox values when modifying shader
 parameter sliders

---
 ui/drivers/qt/ui_qt_window.cpp | 49 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/ui/drivers/qt/ui_qt_window.cpp b/ui/drivers/qt/ui_qt_window.cpp
index 5ef4ed8e18..0cd1a7b4ce 100644
--- a/ui/drivers/qt/ui_qt_window.cpp
+++ b/ui/drivers/qt/ui_qt_window.cpp
@@ -1340,31 +1340,6 @@ void MainWindow::onShaderParamSliderValueChanged(int value)
       return;
 
    spinBoxVariant = slider->property("spinBox");
-
-   if (spinBoxVariant.isValid())
-   {
-      QSpinBox *spinBox = spinBoxVariant.value<QSpinBox*>();
-
-      if (!spinBox)
-         return;
-
-      spinBox->blockSignals(true);
-      spinBox->setValue(slider->value());
-      spinBox->blockSignals(false);
-   }
-   else
-   {
-      QVariant doubleSpinBoxVariant = slider->property("doubleSpinBox");
-      QDoubleSpinBox *doubleSpinBox = doubleSpinBoxVariant.value<QDoubleSpinBox*>();
-
-      if (!doubleSpinBox)
-         return;
-
-      doubleSpinBox->blockSignals(true);
-      doubleSpinBox->setValue(slider->value());
-      doubleSpinBox->blockSignals(false);
-   }
-
    paramVariant = slider->property("param");
 
    if (paramVariant.isValid())
@@ -1377,6 +1352,30 @@ void MainWindow::onShaderParamSliderValueChanged(int value)
          param->current = newValue;
       }
    }
+
+   if (spinBoxVariant.isValid())
+   {
+      QSpinBox *spinBox = spinBoxVariant.value<QSpinBox*>();
+
+      if (!spinBox)
+         return;
+
+      spinBox->blockSignals(true);
+      spinBox->setValue(newValue);
+      spinBox->blockSignals(false);
+   }
+   else
+   {
+      QVariant doubleSpinBoxVariant = slider->property("doubleSpinBox");
+      QDoubleSpinBox *doubleSpinBox = doubleSpinBoxVariant.value<QDoubleSpinBox*>();
+
+      if (!doubleSpinBox)
+         return;
+
+      doubleSpinBox->blockSignals(true);
+      doubleSpinBox->setValue(newValue);
+      doubleSpinBox->blockSignals(false);
+   }
 }
 
 void MainWindow::onShaderParamSpinBoxValueChanged(int value)