summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_ops.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-05-25 00:40:32 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-05-25 00:40:32 +0000
commite5dc4e4ea2cd4f2a91f77464980db52fd4df6b86 (patch)
tree829ac5a39327ca1f167c6bcb1b90dd9238e82f65 /gtk2_ardour/editor_ops.cc
parentbf574116346fdc3804d37c0e7ee424608d7ee38e (diff)
change region selection after a combine op
git-svn-id: svn://localhost/ardour2/branches/3.0@9580 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
-rw-r--r--gtk2_ardour/editor_ops.cc13
1 files changed, 12 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 02bf220b4d..9e46c04eed 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -6426,9 +6426,20 @@ Editor::combine_regions ()
}
begin_reversible_command (_("combine regions"));
+
+ vector<RegionView*> new_selection;
for (RTVS::iterator i = tracks.begin(); i != tracks.end(); ++i) {
- (*i)->combine_regions ();
+ RegionView* rv;
+
+ if ((rv = (*i)->combine_regions ()) != 0) {
+ new_selection.push_back (rv);
+ }
+ }
+
+ selection->clear_regions ();
+ for (vector<RegionView*>::iterator i = new_selection.begin(); i != new_selection.end(); ++i) {
+ selection->add (*i);
}
commit_reversible_command ();