X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmeter_strip.cc;h=094d5170db19f468f2470d333c72b555731e2382;hb=39c253c59068e5757a943efaf57d58e10b299d85;hp=5e2ee92e4fbc341af6132b06b5856e5bf4722687;hpb=5c926136988757f1f11a14c11720ed3daac3195f;p=ardour.git

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index 5e2ee92e4f..094d5170db 100644
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -184,8 +184,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 	name_label.set_layout_ellipsize_width(48 * PANGO_SCALE);
 	name_label.set_size_request(PX_SCALE(18, 18), PX_SCALE(50, 50));
 	name_label.set_alignment(-1.0, .5);
-	set_tooltip (name_label, _route->name());
-	set_tooltip (*level_meter, _route->name());
+	set_tooltip (name_label, Gtkmm2ext::markup_escape_text (_route->name()));
+	set_tooltip (*level_meter, Gtkmm2ext::markup_escape_text (_route->name()));
 
 	number_label.set_corner_radius(2);
 	number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
@@ -488,7 +488,7 @@ MeterStrip::set_tick_bar (int m)
 	} else {
 		n = meter_ticks1_area.get_name();
 		if (n.substr(0,3) == "Bar") {
-			meter_ticks1_area.set_name(n.substr(3,-1));
+			meter_ticks1_area.set_name (n.substr (3));
 		}
 	}
 	if (_tick_bar & 2) {
@@ -499,7 +499,7 @@ MeterStrip::set_tick_bar (int m)
 	} else {
 		n = meter_ticks2_area.get_name();
 		if (n.substr(0,3) == "Bar") {
-			meter_ticks2_area.set_name(n.substr(3,-1));
+			meter_ticks2_area.set_name (n.substr (3));
 		}
 	}
 }
@@ -960,6 +960,7 @@ MeterStrip::set_meter_type_multi (int what, RouteGroup* group, MeterType type)
 			break;
 		case 0:
 			level_meter->set_meter_type (type);
+			break;
 		default:
 			if (what == _strip_type) {
 				level_meter->set_meter_type (type);