# HG changeset patch # User reimar # Date 1185383482 0 # Node ID 7065615ef25ceb732b4e25ffc0123d75fe4c8de8 # Parent 6b6f4d3fbd43f8d181569d334badb21904a9d41c Do not set vo_sub to NULL on changing subtitles, update_subtitles will do this when called with reset == 1. Fixes subtitles getting stuck when switching via 'j'. diff -r 6b6f4d3fbd43 -r 7065615ef25c command.c --- a/command.c Wed Jul 25 15:19:53 2007 +0000 +++ b/command.c Wed Jul 25 17:11:22 2007 +0000 @@ -1289,7 +1289,6 @@ mpctx->set_of_sub_pos = -1; subdata = NULL; - vo_sub_last = vo_sub = NULL; vobsub_id = -1; dvdsub_id = -1; @@ -2376,9 +2375,6 @@ mpctx->set_of_sub_size = 0; if (mpctx->set_of_sub_pos >= 0) { mpctx->global_sub_pos = -2; - vo_sub_last = vo_sub = NULL; - vo_osd_changed(OSDTYPE_SUBTITLE); - vo_update_osd(sh_video->disp_w, sh_video->disp_h); mp_input_queue_cmd(mp_input_parse_cmd("sub_select")); } } else if (v < mpctx->set_of_sub_size) { @@ -2389,9 +2385,6 @@ sub_free(subd); if (mpctx->set_of_sub_pos == v) { mpctx->global_sub_pos = -2; - vo_sub_last = vo_sub = NULL; - vo_osd_changed(OSDTYPE_SUBTITLE); - vo_update_osd(sh_video->disp_w, sh_video->disp_h); mp_input_queue_cmd(mp_input_parse_cmd("sub_select")); } else if (mpctx->set_of_sub_pos > v) { --mpctx->set_of_sub_pos;