version update

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / cwindow.C

diff --git a/cinelerra-5.1/cinelerra/cwindow.C b/cinelerra-5.1/cinelerra/cwindow.C
index 4328162356a290db813da21f4faf84f50ef7fb80..9416cee9ba6b3b4735814495e427b5ed6cc6dc63 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindow.C
+++ b/cinelerra-5.1/cinelerra/cwindow.C
@@ -124,7 +124,7 @@ Track* CWindow::calculate_affected_track()
        Track *track = mwindow->edl->tracks->first;
        for( ; track; track=track->next ) {
                if( track->data_type != TRACK_VIDEO ) continue;
-               if( track->record ) break;
+               if( track->is_armed() ) break;
        }
        return track;
 }
@@ -134,7 +134,7 @@ Track* CWindow::calculate_mask_track()
        Track *track = mwindow->edl->tracks->first;
        for( ; track; track=track->next ) {
                if( track->data_type != TRACK_VIDEO ) continue;
-               if( track->record && track->get_id() == mask_track_id ) break;
+               if( track->is_armed() && track->get_id() == mask_track_id ) break;
        }
        return track;
 }
@@ -190,7 +190,8 @@ void CWindow::calculate_affected_autos(Track *track,
        if( y_auto )
                *y_auto = (FloatAuto*) calculate_affected_auto(track->automation->autos[iy],
                                create_y, &y_created, redraw);
-       if( z_auto ) *z_auto = (FloatAuto*) calculate_affected_auto(track->automation->autos[iz],
+       if( z_auto )
+               *z_auto = (FloatAuto*) calculate_affected_auto(track->automation->autos[iz],
                                create_z, &z_created, redraw);
 }