Merge remote-tracking branch 'upstream/master' into process_in_out

Conflicts:
	src/engine/enginemaster.cpp

1 files changed, 3 insertions, 9 deletions

diff --git a/src/engine/enginevumeter.cpp b/src/engine/enginevumeter.cpp
index 8ef11a497e..79acfd6eaf 100644
--- a/src/engine/enginevumeter.cpp
+++ b/src/engine/enginevumeter.cpp
@@ -88,16 +88,10 @@ void EngineVuMeter::process(CSAMPLE* pIn, const int iBufferSize) {
     }
 
     if (clipped) {
-        if (m_ctrlPeakIndicator->get() != 1.) {
-            m_ctrlPeakIndicator->set(1.);
-        }
+        m_ctrlPeakIndicator->set(1.);
         m_peakDuration = PEAK_DURATION * sampleRate / iBufferSize / 2000;
-    }
-
-    if (m_peakDuration <= 0) {
-        if (m_ctrlPeakIndicator->get() == 1.) {
-            m_ctrlPeakIndicator->set(0.);
-        }
+    } else if (m_peakDuration <= 0) {
+        m_ctrlPeakIndicator->set(0.);
     } else {
         --m_peakDuration;
     }