From 0d184f7a8053951ea8edb854da5d2999e1b61454 Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Sun, 8 Nov 2020 18:25:24 +0100
Subject: [PATCH] Revert "Don't calculate palette before all sliders have
 initialized."

This reverts commit ad7e543dacc3e0460f7dc9f06158315149995bc8.

Added clamping of the returned SliderWidget values to valid range instead
---
 src/gui/VideoAudioDialog.cxx | 28 ----------------------------
 src/gui/Widget.hxx           |  2 +-
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/gui/VideoAudioDialog.cxx b/src/gui/VideoAudioDialog.cxx
index a2e68e329..47c955b94 100644
--- a/src/gui/VideoAudioDialog.cxx
+++ b/src/gui/VideoAudioDialog.cxx
@@ -941,49 +941,21 @@ void VideoAudioDialog::handlePaletteUpdate()
   // TIA Palette
   instance().settings().setValue("palette",
                                   myTIAPalette->getSelectedTag().toString());
-
   // Palette adjustables
   PaletteHandler::Adjustable paletteAdj;
-
-  if (myPhaseShiftNtsc->getValue() < 0) return;
   paletteAdj.phaseNtsc  = myPhaseShiftNtsc->getValue();
-
-  if (myPhaseShiftPal->getValue() < 0) return;
   paletteAdj.phasePal   = myPhaseShiftPal->getValue();
-
-  if (myTVRedScale->getValue() < 0) return;
   paletteAdj.redScale   = myTVRedScale->getValue();
-
-  if (myTVRedShift->getValue() < 0) return;
   paletteAdj.redShift   = myTVRedShift->getValue();
-
-  if (myTVGreenScale->getValue() < 0) return;
   paletteAdj.greenScale = myTVGreenScale->getValue();
-
-  if (myTVGreenShift->getValue() < 0) return;
   paletteAdj.greenShift = myTVGreenShift->getValue();
-
-  if (myTVBlueScale->getValue() < 0) return;
   paletteAdj.blueScale  = myTVBlueScale->getValue();
-
-  if (myTVBlueShift->getValue() < 0) return;
   paletteAdj.blueShift  = myTVBlueShift->getValue();
-
-  if (myTVHue->getValue() < 0) return;
   paletteAdj.hue        = myTVHue->getValue();
-
-  if (myTVSatur->getValue() < 0) return;
   paletteAdj.saturation = myTVSatur->getValue();
-
-  if (myTVContrast->getValue() < 0) return;
   paletteAdj.contrast   = myTVContrast->getValue();
-
-  if (myTVBright->getValue() < 0) return;
   paletteAdj.brightness = myTVBright->getValue();
-
-  if (myTVGamma->getValue() < 0) return;
   paletteAdj.gamma      = myTVGamma->getValue();
-
   instance().frameBuffer().tiaSurface().paletteHandler().setAdjustables(paletteAdj);
 
   if(instance().hasConsole())
diff --git a/src/gui/Widget.hxx b/src/gui/Widget.hxx
index 91fffff04..50e71681e 100644
--- a/src/gui/Widget.hxx
+++ b/src/gui/Widget.hxx
@@ -336,7 +336,7 @@ class SliderWidget : public ButtonWidget
     ~SliderWidget() override = default;
 
     void setValue(int value);
-    int getValue() const { return _value; }
+    int getValue() const { return BSPF::clamp(_value, _valueMin, _valueMax); }
 
     void setMinValue(int value);
     int  getMinValue() const { return _valueMin; }