Updating branch refs/heads/master
to 1fff37cb59cedb0bd3eee57a213b08a3f2cb7ade (commit)
from c7e47ac876df39ea5b3d1b4a1528426487700e5c (commit)
commit 1fff37cb59cedb0bd3eee57a213b08a3f2cb7ade
Author: Sean Davis <smd.seanda...@gmail.com>
Date: Thu Jul 18 18:38:41 2013 -0400
Revert "Fix MKV subtitles being shown when automatically show subtitles is
disabled (bug 9880)"
This reverts commit e68d704de79c6a81842195e1356a6be78d1b7c25. This commit
fixed 9880, but reintroduced an old bug where subtitles would freeze the
application. Some subtitles are better than none.
src/parole-player.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/parole-player.c b/src/parole-player.c
index b942607..08cfb71 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -3305,6 +3305,7 @@ void
parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget, ParolePlay
void parole_player_combo_box_subtitles_changed_cb(GtkWidget *widget,
ParolePlayer *player)
{
gint sub_index =
gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_subtitles));
+ if (player->priv->update_languages == FALSE)
gst_set_current_subtitle_track(PAROLE_GST(player->priv->gst),
sub_index);
parole_player_set_subtitle_radio_menu_item_selected(player, sub_index);
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
