projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixup for older distros + updated Preference/About messages
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
track.C
diff --git
a/cinelerra-5.1/cinelerra/track.C
b/cinelerra-5.1/cinelerra/track.C
index 030348302fe3c7e6212c100e9d9dfb56f8cc7808..5c07480e249799bbc242512d11764591a357cc6e 100644
(file)
--- 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()
{
int Track::is_armed()
{
- return gang_master()->armed;
+ return
armed &&
gang_master()->armed;
}
int Track::is_ganged()
{
}
int Track::is_ganged()
{
- return gang_master()->ganged;
+ return gang
ed && gang
_master()->ganged;
}
int Track::armed_gang(Track *track)
{
}
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( 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;
for(;;) {
if( track == current ) return 1;
current = current->next;
@@
-1858,7
+1860,7
@@
int Track::armed_gang(Track *track)
int Track::plays()
{
int Track::plays()
{
- return gang_master()->play;
+ return
play &&
gang_master()->play;
}
int Track::index_in(Mixer *mixer)
}
int Track::index_in(Mixer *mixer)