summaryrefslogtreecommitdiffstats
path: root/gtk/src/subtitlehandler.c
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2009-10-03 16:47:09 +0000
committerjstebbins <[email protected]>2009-10-03 16:47:09 +0000
commitd3a040aafa87d4f56dc6e6b2531afe407432f0b2 (patch)
tree4ac8655316ea409e61dffa32233638b2359d0fbe /gtk/src/subtitlehandler.c
parent1c4d36e2a35669c27629299dfaae82e043fcf4a0 (diff)
LinGui: fix a couple subtitle UI issues
- SRT filename was getting lost when moving the subtitle highlight around - SRT subtitles didn't get reloaded properly when editing a queue item git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2862 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/subtitlehandler.c')
-rw-r--r--gtk/src/subtitlehandler.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c
index c5fc0b83b..b1b614835 100644
--- a/gtk/src/subtitlehandler.c
+++ b/gtk/src/subtitlehandler.c
@@ -822,7 +822,7 @@ srt_file_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
{
GValue *settings;
- g_debug("srt_changed_cb ()");
+ g_debug("srt_file_changed_cb ()");
ghb_check_dependency(ud, widget, NULL);
ghb_widget_to_setting(ud->settings, widget);
settings = ghb_selected_subtitle_settings(ud);
@@ -1312,8 +1312,14 @@ ghb_reset_subtitles(signal_user_data_t *ud, GValue *settings)
count = ghb_array_len(slist);
for (ii = 0; ii < count; ii++)
{
+ int source;
+
subtitle = ghb_value_dup(ghb_array_get_nth(slist, ii));
- ghb_add_subtitle(ud, subtitle);
+ source = ghb_settings_get_int(subtitle, "SubtitleSource");
+ if (source == SRTSUB)
+ ghb_add_srt(ud, subtitle);
+ else
+ ghb_add_subtitle(ud, subtitle);
}
}