summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_canvas.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-01-10 04:25:47 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-01-10 04:25:47 +0000
commita9e38032a376df3c8a930457211813958f3ba73b (patch)
treeea3c54b763ba1426577f1b738331c9f16e6d0363 /gtk2_ardour/editor_canvas.cc
parent86f540cb051e8314f3456630d216743800c5b84e (diff)
route list + edit group list now pretty much functional, plus preparations for ardour2.0-alpha1
git-svn-id: svn://localhost/trunk/ardour2@253 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
-rw-r--r--gtk2_ardour/editor_canvas.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 2c0f72ffe4..d999c1187e 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -367,8 +367,10 @@ Editor::reset_scrolling_region (Gtk::Allocation* alloc)
for (pos = 0, i = rows.begin(); i != rows.end(); ++i) {
TimeAxisView *tv = (*i)[route_display_columns.tv];
- pos += tv->effective_height;
- pos += track_spacing;
+ if (tv != 0) {
+ pos += tv->effective_height;
+ pos += track_spacing;
+ }
}
RefPtr<Gdk::Screen> screen = get_screen();
@@ -396,8 +398,10 @@ Editor::controls_layout_size_request (Requisition* req)
for (pos = 0, i = rows.begin(); i != rows.end(); ++i) {
TimeAxisView *tv = (*i)[route_display_columns.tv];
- pos += tv->effective_height;
- pos += track_spacing;
+ if (tv != 0) {
+ pos += tv->effective_height;
+ pos += track_spacing;
+ }
}
RefPtr<Gdk::Screen> screen = get_screen();