LinGui: change mp4 extension to m4v if there are any soft subtitles

yet another qt boneheadism


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2775 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 6 insertions, 9 deletions

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index bd06126b1..eda462875 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -522,21 +522,18 @@ get_extension(signal_user_data_t *ud)
 	int container;
 	const gchar *extension = "error";
 	GValue *audio_list;
+	GValue *subtitle_list;
 
 	container = ghb_settings_combo_int(ud->settings, "FileFormat");
 	if (container == HB_MUX_MP4)
 	{
 		extension = "mp4";
 		audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-		if (ghb_ac3_in_audio_list (audio_list))
-		{
-			extension = "m4v";
-		}
-		else if (ghb_settings_get_boolean(ud->settings, "ChapterMarkers"))
-		{
-			extension = "m4v";
-		}
-		else if (ghb_settings_get_boolean(ud->settings, "UseM4v"))
+		subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+		if (ghb_ac3_in_audio_list(audio_list) ||
+			ghb_soft_in_subtitle_list(subtitle_list) ||
+			ghb_settings_get_boolean(ud->settings, "ChapterMarkers") ||
+			ghb_settings_get_boolean(ud->settings, "UseM4v"))
 		{
 			extension = "m4v";
 		}