X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitler.C;h=77132e7b4f890917f7227b2d4dd842763c8820b7;hb=a07e46d684a8aff4b56566b010b697ba9891872d;hp=aa4619fb1179c72f43948975cf5cfe7f46a5a290;hpb=efa5246e9610548448a6e4d505fdc6bdb5da84eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/titler/titler.C b/cinelerra-5.1/plugins/titler/titler.C
index aa4619fb..77132e7b 100644
--- a/cinelerra-5.1/plugins/titler/titler.C
+++ b/cinelerra-5.1/plugins/titler/titler.C
@@ -2329,7 +2329,8 @@ void TitleMain::draw_overlay()
 
 	if( !translate )
 		translate = new TitleTranslate(this, cpus);
-	if( text_x+mask_w > 0 && text_x < title_w ) {
+	int tx = text_x - text_x1 + mask_x1;
+	if( tx < title_w && tx+mask_w > 0 ) {
 		translate->xlat_mask = text_mask;
 		translate->run_packages();
 		if( config.stroke_width >= SMALL && (config.style & BC_FONT_OUTLINE) ) {
@@ -2604,11 +2605,19 @@ void TitleMain::save_data(KeyFrame *keyframe)
 	output.tag.set_property("LOOP_PLAYBACK", config.loop_playback);
 	output.append_tag();
 	output.append_newline();
-	char text[BCTEXTLEN];
+	char text[2*sizeof(config.wtext)];
 	int text_len = BC_Resources::encode(
 		BC_Resources::wide_encoding, DEFAULT_ENCODING,
 		(char*)config.wtext, config.wlen*sizeof(wchar_t),
 		text, sizeof(text));
+	int len = output.length(), avail = MESSAGESIZE-16 - len;
+	if( text_len >= avail ) { // back off last utf8 char
+		text_len = avail;
+		while( text_len > 0 && (text[text_len-1] & 0xc0) == 0x80 )
+			text[--text_len] = 0;
+		if( text_len > 0 )
+			text[--text_len] = 0;
+	}
 	output.append_text(text, text_len);
 	output.tag.set_title("/TITLE");
 	output.append_tag();