labels follow edits fix, group only ungrouped edits, add reset to 7 plugins, add...

[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 67f4402c73664674a6a0fd74cc3e8804ea2c17fc..787ca44c5819555d1f4852292f81997ef63a2b17 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -1880,18 +1880,16 @@ int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
                if( load_mode != LOADMODE_RESOURCESONLY &&
                    load_mode != LOADMODE_ASSETSONLY ) {
 // Insert labels
+                       if( edl->session->labels_follow_edits ) {
 //printf("MWindow::paste_edls %f %f\n", current_position, edl_length);
-                       if( load_mode == LOADMODE_PASTE ||
-                           load_mode == LOADMODE_NESTED )
-                               edl->labels->insert_labels(new_edl->labels,
-                                       destination_tracks.total ? paste_position[0] : 0.0,
-                                       edl_length,
-                                       edit_labels);
-                       else
-                               edl->labels->insert_labels(new_edl->labels,
-                                       current_position,
-                                       edl_length,
-                                       edit_labels);
+                               if( load_mode == LOADMODE_PASTE || load_mode == LOADMODE_NESTED )
+                                       edl->labels->insert_labels(new_edl->labels,
+                                               destination_tracks.total ? paste_position[0] : 0.0,
+                                               edl_length, edit_labels);
+                               else
+                                       edl->labels->insert_labels(new_edl->labels, current_position,
+                                               edl_length, edit_labels);
+                       }
 //PRINT_TRACE
                        double total_length = new_edl->tracks->total_length();
                        for( Track *new_track=new_edl->tracks->first;