X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Ftrack.C;h=7960a96eda66fdb6f534195cb3fccf4767890bad;hb=fdf615e4b9eb6ce8faecc7f138c28edf0efac3be;hp=5c07480e249799bbc242512d11764591a357cc6e;hpb=a718f58e6d8061f83bd0c0b10848ac415cd21fcd;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/track.C b/cinelerra-5.1/cinelerra/track.C
index 5c07480e..7960a96e 100644
--- a/cinelerra-5.1/cinelerra/track.C
+++ b/cinelerra-5.1/cinelerra/track.C
@@ -1,6 +1,7 @@
 /*
  * CINELERRA
  * Copyright (C) 2010 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1836,20 +1837,22 @@ int Track::in_gang(Track *track)
 
 int Track::is_armed()
 {
-	return armed && gang_master()->armed;
+//	return armed && gang_master()->armed;
+	return gang_master()->armed;
 }
 
 int Track::is_ganged()
 {
-	return ganged && gang_master()->ganged;
+//	return ganged && gang_master()->ganged;
+	return gang_master()->ganged;
 }
 
 int Track::armed_gang(Track *track)
 {
-	if( !track->ganged ) return 0;
+//	if( !track->ganged ) return 0;
 	if( edl->local_session->gang_tracks == GANG_NONE ) return ganged;
 	Track *current = gang_master();
-	if( !current->ganged ) return 0;
+//	if( !current->ganged ) return 0;
 	for(;;) {
 		if( track == current ) return 1;
 		current = current->next;