summaryrefslogtreecommitdiff
path: root/gtk2_ardour/meterbridge.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-09-14 16:42:40 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-09-14 16:42:40 -0400
commit7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a (patch)
tree25e1b01865e76193f3c88483d4f9de1c8abf2f9d /gtk2_ardour/meterbridge.cc
parente6521bb0434d88802aa28e75235bc8c19ebb9262 (diff)
parentf5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff)
fix merge conflicts with master
Diffstat (limited to 'gtk2_ardour/meterbridge.cc')
-rw-r--r--gtk2_ardour/meterbridge.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index 4a4f1dd8dd..8756089e00 100644
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -702,11 +702,11 @@ Meterbridge::sync_order_keys (RouteSortOrderKey)
MeterType nmt = (*i).s->meter_type();
if (nmt == MeterKrms) nmt = MeterPeak; // identical metrics
- if (pos == 0) {
+ if (vis == 1) {
(*i).s->set_tick_bar(1);
}
- if ((*i).visible && nmt != lmt && pos == 0) {
+ if ((*i).visible && nmt != lmt && vis == 1) {
lmt = nmt;
metrics_left.set_metric_mode(1, lmt);
} else if ((*i).visible && nmt != lmt) {