diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-12-30 20:05:48 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-12-30 20:05:48 +0000 |
| commit | dd53e7284ae1ef8ae594cb1a34db6500f944eab3 (patch) | |
| tree | 88efed9f99a937cb065f8cbff81c441d8d3abcfb /gtk2_ardour/editor_drag.cc | |
| parent | 2c23ff8ceb51297aee7ae71d96e9b61dc9089343 (diff) | |
Set up layering_index immediately on an explicit layer, so that undo
works properly. Stop the layer being a stateful property, as it is
always derived from layering_index, unambigiously, by relayer().
git-svn-id: svn://localhost/ardour2/branches/3.0@11120 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 02e5f91f7d..e07844f7a9 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -1047,7 +1047,7 @@ RegionMoveDrag::finished_no_copy ( boost::shared_ptr<Playlist> playlist = dest_rtv->playlist(); if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) { - rv->region()->set_pending_layer (dest_layer); + playlist->set_layer (rv->region(), dest_layer); } /* freeze playlist to avoid lots of relayering in the case of a multi-region drag */ @@ -1192,7 +1192,7 @@ RegionMoveDrag::insert_region_into_playlist ( dest_playlist->add_region (region, where); if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) { - region->set_pending_layer (dest_layer); + dest_playlist->set_layer (region, dest_layer); } c.disconnect (); |