X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=6744cee88f3e2fcc050853b7c5ee8d614d761c85;hp=6f74435b63610b0e6a6157267a1a9dadaf15aa2f;hb=54b918a8b84f666bf32548ebd12b93908061d2a6;hpb=4d76ed2e81154119f8335aeb70724468e08dbb94

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index 6f74435b..6744cee8 100644
--- 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;
 
@@ -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 ) {