Timeline: fix crash when removing a track.
This commit is contained in:
parent
82f9610ca8
commit
a0fd557baf
|
@ -608,11 +608,6 @@ Track::remove ( Audio_Sequence *t )
|
||||||
|
|
||||||
Logger log(this);
|
Logger log(this);
|
||||||
|
|
||||||
if ( t->id() == 0x2785 )
|
|
||||||
{
|
|
||||||
WARNING( "****** 0x2785 removed here *****");
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( sequence() == t )
|
if ( sequence() == t )
|
||||||
{
|
{
|
||||||
pack->remove( t );
|
pack->remove( t );
|
||||||
|
@ -626,7 +621,8 @@ Track::remove ( Audio_Sequence *t )
|
||||||
else
|
else
|
||||||
takes->remove( t );
|
takes->remove( t );
|
||||||
|
|
||||||
delete t;
|
/* doing this here creates a cycle */
|
||||||
|
/* delete t; */
|
||||||
|
|
||||||
Loggable::block_end();
|
Loggable::block_end();
|
||||||
|
|
||||||
|
@ -660,12 +656,6 @@ Track::sequence ( Audio_Sequence * t )
|
||||||
{
|
{
|
||||||
Logger log(this);
|
Logger log(this);
|
||||||
|
|
||||||
/* FIXME: testing */
|
|
||||||
if ( sequence() != NULL && sequence()->id() == 0x2785 )
|
|
||||||
{
|
|
||||||
DMESSAGE( "****** Here *****");
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( sequence() == t )
|
if ( sequence() == t )
|
||||||
{
|
{
|
||||||
/* ASSERT( false, "Attempt to set same sequence twice" ); */
|
/* ASSERT( false, "Attempt to set same sequence twice" ); */
|
||||||
|
|
Loading…
Reference in New Issue