X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fpresets.c;h=c17a902d4e22fd96e92e645a324d03da6ccff72e;hb=47f681558afcfa3032c64a73f605b1d73812bfc7;hp=b419414e6c6d78d7edc60ca736eae62ec967df8e;hpb=61c0e9c10ba95847f39e1610d52257ac42162b20;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index b419414e..c17a902d 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -1392,6 +1392,8 @@ ghb_prefs_load(signal_user_data_t *ud)
 		}
 		ghb_dict_insert(dict, 
 			g_strdup("destination_dir"), ghb_value_dup(ghb_string_value(dir)));
+		ghb_dict_insert(dict, 
+			g_strdup("SrtDir"), ghb_value_dup(ghb_string_value(dir)));
 #if defined(_WIN32)
 		gchar *source;
 
@@ -1763,7 +1765,7 @@ static value_map_t acodec_xlat[] =
 value_map_t container_xlat[] =
 {
 	{"MP4 file", "mp4"},
-	{"M4V file", "m4v"},
+	{"M4V file", "mp4"},
 	{"MKV file", "mkv"},
 	{"AVI file", "mkv"},
 	{"OGM file", "mkv"},
@@ -3064,7 +3066,7 @@ update_subtitle_presets(signal_user_data_t *ud)
 	g_debug("update_subtitle_presets");
 	const GValue *subtitle_list, *subtitle;
 	GValue *slist, *dict;
-	gint count, ii;
+	gint count, ii, source;
 
 	subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
 	slist = ghb_array_value_new(8);
@@ -3072,10 +3074,14 @@ update_subtitle_presets(signal_user_data_t *ud)
 	for (ii = 0; ii < count; ii++)
 	{
 		subtitle = ghb_array_get_nth(subtitle_list, ii);
-		dict = ghb_value_dup(subtitle);
-		ghb_array_append(slist, dict);
+		source = ghb_settings_get_int(subtitle, "SubtitleSource");
+		if (source != SRTSUB)
+		{
+			dict = ghb_value_dup(subtitle);
+			ghb_array_append(slist, dict);
+		}
 	}
-	ghb_settings_set_value(ud->settings, "SubtitleList", slist);
+	ghb_settings_take_value(ud->settings, "SubtitleList", slist);
 }
 
 void