From a0fd557baf46a98d43196c3f0cc38fe81dba157f Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Sat, 21 Nov 2020 18:28:56 -0800 Subject: [PATCH] Timeline: fix crash when removing a track. --- timeline/src/Track.C | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/timeline/src/Track.C b/timeline/src/Track.C index 084dd96..362ffba 100644 --- a/timeline/src/Track.C +++ b/timeline/src/Track.C @@ -608,11 +608,6 @@ Track::remove ( Audio_Sequence *t ) Logger log(this); - if ( t->id() == 0x2785 ) - { - WARNING( "****** 0x2785 removed here *****"); - } - if ( sequence() == t ) { pack->remove( t ); @@ -626,7 +621,8 @@ Track::remove ( Audio_Sequence *t ) else takes->remove( t ); - delete t; + /* doing this here creates a cycle */ + /* delete t; */ Loggable::block_end(); @@ -660,12 +656,6 @@ Track::sequence ( Audio_Sequence * t ) { Logger log(this); - /* FIXME: testing */ - if ( sequence() != NULL && sequence()->id() == 0x2785 ) - { - DMESSAGE( "****** Here *****"); - } - if ( sequence() == t ) { /* ASSERT( false, "Attempt to set same sequence twice" ); */