X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrack.C;h=5c07480e249799bbc242512d11764591a357cc6e;hb=eabda9cf447580a974fd3d67a3d0a26f09aeb523;hp=030348302fe3c7e6212c100e9d9dfb56f8cc7808;hpb=b384d47608e07b9f5b6ce5fe1d0d76d9bda38202;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/track.C b/cinelerra-5.1/cinelerra/track.C
index 03034830..5c07480e 100644
--- a/cinelerra-5.1/cinelerra/track.C
+++ b/cinelerra-5.1/cinelerra/track.C
@@ -1836,18 +1836,20 @@ int Track::in_gang(Track *track)
 
 int Track::is_armed()
 {
-	return gang_master()->armed;
+	return armed && gang_master()->armed;
 }
 
 int Track::is_ganged()
 {
-	return gang_master()->ganged;
+	return ganged && gang_master()->ganged;
 }
 
 int Track::armed_gang(Track *track)
 {
+	if( !track->ganged ) return 0;
 	if( edl->local_session->gang_tracks == GANG_NONE ) return ganged;
 	Track *current = gang_master();
+	if( !current->ganged ) return 0;
 	for(;;) {
 		if( track == current ) return 1;
 		current = current->next;
@@ -1858,7 +1860,7 @@ int Track::armed_gang(Track *track)
 
 int Track::plays()
 {
-	return gang_master()->play;
+	return play && gang_master()->play;
 }
 
 int Track::index_in(Mixer *mixer)