X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedit.C;h=853baf7ef673366e9eebda7167f9d784353018f9;hb=5621db270ccbeabc106e0f438941dba6f930652b;hp=4c257cbe964164a274187b3ab11f8d6515048d9f;hpb=3f6a262cfe390b3f8b275297d64565a5b6272969;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C
index 4c257cbe..853baf7e 100644
--- a/cinelerra-5.1/cinelerra/edit.C
+++ b/cinelerra-5.1/cinelerra/edit.C
@@ -32,7 +32,7 @@
 #include "localsession.h"
 #include "plugin.h"
 #include "mainsession.h"
-#include "nestededls.h"
+#include "strack.h"
 #include "trackcanvas.h"
 #include "tracks.h"
 #include "transition.h"
@@ -233,13 +233,15 @@ void Edit::detach_transition()
 
 int Edit::silence()
 {
-	return asset || nested_edl ? 0 : 1;
+	return (track->data_type != TRACK_SUBTITLE ?
+		asset || nested_edl :
+		*((SEdit *)this)->get_text()) ? 0 : 1;
 }
 
 
 void Edit::copy_from(Edit *edit)
 {
-	this->nested_edl = edl->nested_edls->get_copy(edit->nested_edl);
+	this->nested_edl = edl->nested_edls.get_nested(edit->nested_edl);
 	this->asset = edl->assets->update(edit->asset);
 	this->startsource = edit->startsource;
 	this->startproject = edit->startproject;