diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-26 17:22:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-26 17:22:22 +0000 |
| commit | d6be900da002cde17570e742bcc48f1588f73dc9 (patch) | |
| tree | 8996b368649d87610329a54385960ee3c013204f /gtk2_ardour/route_time_axis.cc | |
| parent | 92ede6153eaf7eaae359a456307f697d04e2fcb7 (diff) | |
more combine/uncombine fixes including making uncombine push the compound region gain level into the constituents and doing the right thing when we uncombine in a playlist other than the one in which the compound region was created
git-svn-id: svn://localhost/ardour2/branches/3.0@9601 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index f1e00978e9..86832de764 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -2498,6 +2498,10 @@ RouteTimeAxisView::combine_regions () boost::shared_ptr<Playlist> playlist = track()->playlist(); _view->foreach_selected_regionview (sigc::bind (sigc::ptr_fun (add_region_to_list), &selected_regions)); + + if (selected_regions.size() < 2) { + return 0; + } playlist->clear_changes (); boost::shared_ptr<Region> compound_region = playlist->combine (selected_regions); |