fix incorrect lexical scope introduced during rebase conflict resolution
This commit is contained in:
parent
029fb065b7
commit
5498c433ad
@ -1269,8 +1269,6 @@ Playlist::paste (boost::shared_ptr<Playlist> other, timepos_t const & position,
|
|||||||
timecnt_t const shift (other->_get_extent().second, other->_get_extent().first);
|
timecnt_t const shift (other->_get_extent().second, other->_get_extent().first);
|
||||||
layer_t top = top_layer ();
|
layer_t top = top_layer ();
|
||||||
|
|
||||||
{
|
|
||||||
|
|
||||||
{
|
{
|
||||||
RegionWriteLock rl1 (this);
|
RegionWriteLock rl1 (this);
|
||||||
while (itimes--) {
|
while (itimes--) {
|
||||||
|
Loading…
Reference in New Issue
Block a user