bug fix for In/Out pointer Attach Effect on empty track/location - Andrew+Anon

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

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index 6f74435b63610b0e6a6157267a1a9dadaf15aa2f..458ced964e8f3418505b7d27ccf19adb80662dd0 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -779,7 +779,7 @@ void MWindow::insert_effects_canvas(Track *dest_track, double start, double leng
 
        ArrayList<SharedLocation> shared_locations;
        PluginSet *pluginset = session->pluginset_highlighted;
-       int gang = edl->session->gang_tracks != GANG_NONE ? 1 : 0;
+       int gang = edl->local_session->gang_tracks != GANG_NONE ? 1 : 0;
        int data_type = dest_track->data_type;
        int first_track = 1;
 
@@ -841,8 +841,8 @@ void MWindow::insert_effect(char *title, SharedLocation *shared_location,
        SharedLocation shared_location_local;
        shared_location_local.copy_from(shared_location);
        int first_track = 1;
-       double start_pos = edl->local_session->get_selectionstart(1);
-       double end_pos = edl->local_session->get_selectionend(1);
+       double start_pos = edl->local_session->get_selectionstart();
+       double end_pos = edl->local_session->get_selectionend();
        for( ; current; current=NEXT ) {
                if( current->data_type != data_type ) continue;
                if( !current->is_armed() ) continue;
@@ -2869,6 +2869,10 @@ int MWindow::masters_to_mixers()
                for( ; track && !track->master; track=track->next )
                        mixer_last = track;
                Track *next_track = track;
+               if( !master_track->armed ) {
+                       master_track = next_track;
+                       continue;
+               }
                Mixer *master_mixer = 0;
                for( int i=0, n=edl->mixers.size(); i<n; ++i ) {
                        if( master_track->index_in(edl->mixers[i]) >= 0 ) {