From 4697af4cb3a01dd7dff88ff8f9ff8b6eef1639d6 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Tue, 4 Dec 2012 22:21:01 +0000 Subject: lingui: fix subtitle configuration problem If the preset has "burned" checked, under certain circumstances, both "burned" and "default" would be checked in the gui. These are suppose to be mutually exclusive. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5089 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- gtk/src/subtitlehandler.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c index bf393f08c..2fe053eca 100644 --- a/gtk/src/subtitlehandler.c +++ b/gtk/src/subtitlehandler.c @@ -420,7 +420,8 @@ ghb_set_pref_subtitle_settings(gint titleindex, GValue *settings) track_lang = ghb_subtitle_track_lang(settings, track); ghb_settings_set_int(dup, "SubtitleTrack", track); if (foreign_lang_index < 0 && pref_lang != NULL && - strcmp(track_lang, pref_lang) == 0) + strcmp(track_lang, pref_lang) == 0 && + !ghb_settings_get_boolean(dup, "SubtitleBurned")) { foreign_lang_index = jj; ghb_settings_take_value(dup, "SubtitleForced", -- cgit v1.2.3