summaryrefslogtreecommitdiff
path: root/gtk2_ardour/level_meter.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-08-24 12:18:06 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-08-24 12:18:06 -0400
commitee1b49f87e4b8e6406c059f29371892872d3fb85 (patch)
tree107f163d9f707c97a0b8179a5f2afd9995d616ec /gtk2_ardour/level_meter.cc
parent8cd71108c1d153f84f25c3b9e5153a110826c130 (diff)
parent1421a34e52862b614f280c751a12893e4abecf88 (diff)
fix merge conflicts from master
Diffstat (limited to 'gtk2_ardour/level_meter.cc')
-rw-r--r--gtk2_ardour/level_meter.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 66dda804b1..6f48864992 100644
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -138,7 +138,7 @@ LevelMeterBase::update_meters ()
const float mpeak = _meter->meter_level(n, MeterMaxPeak);
if (mpeak > (*i).max_peak) {
(*i).max_peak = mpeak;
- (*i).meter->set_highlight(mpeak > Config->get_meter_peak());
+ (*i).meter->set_highlight(mpeak >= Config->get_meter_peak());
}
if (mpeak > max_peak) {
max_peak = mpeak;