From c86210a9d5bdb7b36ad58552a1f99f53d48781b3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 10 Sep 2008 21:27:39 +0000 Subject: merge 2.0-ongoing into 3.0 @ 3581 - 3710 git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_region_list.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour/editor_region_list.cc') diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc index 54bc71e074..121550f86f 100644 --- a/gtk2_ardour/editor_region_list.cc +++ b/gtk2_ardour/editor_region_list.cc @@ -140,8 +140,8 @@ Editor::add_region_to_region_display (boost::shared_ptr region) for (i = rows.begin(); i != rows.end(); ++i) { boost::shared_ptr rr = (*i)[region_list_columns.region]; - - if (region->region_list_equivalent (rr)) { + + if (rr && region->region_list_equivalent (rr)) { return; } } -- cgit v1.2.3