X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fstreamview.cc;h=28905ee45f5a71af84a9870d5235b91e5d8ff56f;hb=7f1784252882cd216a9912f57f66533cc06af8a5;hp=17c261200f4a11850f6cb3af2edb82774faf821f;hpb=121ef12ae71a4b6e8c3e9518d6e0ff04a7efc103;p=ardour.git

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 17c261200f..28905ee45f 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -101,7 +101,7 @@ StreamView::~StreamView ()
 	if (owns_background_group) {
 		delete _background_group;
 	}
-	
+
 	if (owns_canvas_group) {
 		delete _canvas_group;
 	}
@@ -308,7 +308,7 @@ StreamView::playlist_layered (boost::weak_ptr<Track> wtr)
 	} else {
 		/* layering has probably been modified. reflect this in the canvas. */
 		layer_regions();
-	} 
+	}
 }
 
 void
@@ -348,7 +348,7 @@ void
 StreamView::diskstream_changed ()
 {
 	boost::shared_ptr<Track> t;
-        
+
 	if ((t = _trackview.track()) != 0) {
 		Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::display_track, this, t));
 	} else {
@@ -357,7 +357,7 @@ StreamView::diskstream_changed ()
 }
 
 void
-StreamView::apply_color (Gdk::Color& color, ColorTarget target)
+StreamView::apply_color (Gdk::Color color, ColorTarget target)
 {
 	list<RegionView *>::iterator i;
 
@@ -523,8 +523,21 @@ StreamView::get_selectables (framepos_t start, framepos_t end, double top, doubl
 
 	if (_layer_display == Stacked) {
 		double const c = child_height ();
-		min_layer = _layers - ((bottom - _trackview.y_position()) / c);
-		max_layer = _layers - ((top - _trackview.y_position()) / c);
+
+		int const mi = _layers - ((bottom - _trackview.y_position()) / c);
+		if (mi < 0) {
+			min_layer = 0;
+		} else {
+			min_layer = mi;
+		}
+
+		int const ma = _layers - ((top - _trackview.y_position()) / c);
+		if (ma > (int) _layers) {
+			max_layer = _layers - 1;
+		} else {
+			max_layer = ma;
+		}
+
 	}
 
 	for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
@@ -624,13 +637,13 @@ StreamView::check_record_layers (boost::shared_ptr<Region> region, framepos_t to
 
 		/* Stop this happening again */
 		_new_rec_layer_time = max_framepos;
-		
+
 		/* Make space in the view for the new layer */
 		++_layers;
-		
+
 		/* Set the temporary region to the correct layer so that it gets drawn correctly */
 		region->set_layer (_layers - 1);
-		
+
 		/* and reset the view */
 		update_contents_height ();
 	}