X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fswindow.C;h=8e558fd1c221853547b2d96a4e5e52627c22c11e;hb=48a6854a1ca58aa291ffc6fe3a48807492dfbef7;hp=770556c64a99f942f8ae500869d8974c284f8c10;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/swindow.C b/cinelerra-5.1/cinelerra/swindow.C
index 770556c6..8e558fd1 100644
--- a/cinelerra-5.1/cinelerra/swindow.C
+++ b/cinelerra-5.1/cinelerra/swindow.C
@@ -428,7 +428,7 @@ int SWindowGUI::update_selection()
 	Edit *edit = 0;
 	Tracks *tracks = edl->tracks;
 	for( Track *track=tracks->first; track && !edit; track=track->next ) {
-		if( !track->record ) continue;
+		if( !track->is_armed() ) continue;
 		if( track->data_type != TRACK_SUBTITLE ) continue;
 		int64_t pos = track->to_units(position,0);
 		edit = track->edits->editof(pos, PLAY_FORWARD, 0);
@@ -448,7 +448,7 @@ int MWindow::paste_subtitle_text(char *text, double start, double end)
 	Tracks *tracks = edl->tracks;
 	for( Track *track=tracks->first; track; track=track->next ) {
 		if( track->data_type != TRACK_SUBTITLE ) continue;
-		if( !track->record ) continue;
+		if( !track->is_armed() ) continue;
 		int64_t start_i = track->to_units(start, 0);
 		int64_t end_i = track->to_units(end, 1);
 		track->edits->clear(start_i,end_i);
@@ -838,11 +838,14 @@ void SWindowGUI::save_spumux_data()
 	Tracks *tracks = swindow->mwindow->edl->tracks;
 	for( Track *track=tracks->first; track; track=track->next ) {
 		if( track->data_type != TRACK_SUBTITLE ) continue;
-		if( !track->record ) continue;
+		if( !track->is_armed() ) continue;
 		char *cp = track_title, *ep = cp+sizeof(track_title)-6;
 		for( const char *bp=track->title; cp<ep && *bp!=0; ) {
-			int b = butf8(bp), c = !iswalnum(b) ? '_' : b;
-			butf8(c, cp);
+			int wch = butf8(bp); // iswalnum(wch) broken by MS port
+			if( !( (wch >= 'A' && wch <= 'Z') ||
+			       (wch >= 'a' && wch <= 'z') ||
+			       (wch >= '0' && wch <= '9') ) ) wch = '_';
+			butf8(wch, cp);
 		}
 		*cp = 0;
 		snprintf(ext,len,"-%s.udvd",track_title);