mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Properly handle removal of a track's active sequence.

This commit is contained in:
Jonathan Moore Liles 2008-07-31 23:18:43 -05:00
parent d84383c704
commit b25c206ceb
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Timeline/Sequence.C
View File

@ -78,6 +78,9 @@ Sequence::~Sequence ( )
if ( _widgets.size() ) if ( _widgets.size() )
FATAL( "programming error: leaf destructor must call Sequence::clear()!" ); FATAL( "programming error: leaf destructor must call Sequence::clear()!" );
if ( parent() )
parent()->remove( this );
} }

13
Timeline/Track.C
View File

@ -490,7 +490,18 @@ Track::remove ( Audio_Sequence *t )
timeline->wrlock(); timeline->wrlock();
takes->remove( t ); if ( sequence() == t )
{
pack->remove( t );
if ( takes->children() )
sequence( (Audio_Sequence*)takes->child( 0 ) );
else
/* FIXME: should this ever happen? */
_sequence = NULL;
}
else
takes->remove( t );
/* delete t; */ /* delete t; */