summaryrefslogtreecommitdiffstats
path: root/command.c
diff options
context:
space:
mode:
Diffstat (limited to 'command.c')
-rw-r--r--command.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/command.c b/command.c
index 1e54327d44..de7f1fbca9 100644
--- a/command.c
+++ b/command.c
@@ -459,7 +459,7 @@ static int mp_property_percent_pos(m_option_t *prop, int action,
/// Current position in seconds (RW)
static int mp_property_time_pos(m_option_t *prop, int action,
void *arg, MPContext *mpctx) {
- if (!(mpctx->sh_video || (mpctx->sh_audio && mpctx->audio_out)))
+ if (!(mpctx->sh_video || mpctx->sh_audio))
return M_PROPERTY_UNAVAILABLE;
switch(action) {
@@ -2670,9 +2670,16 @@ static void remove_subtitle_range(MPContext *mpctx, int start, int count)
}
for (idx = start; idx < end; idx++) {
sub_data *subd = subs[idx];
+ char *filename = "";
+ if (subd)
+ filename = subd->filename;
+#ifdef CONFIG_ASS
+ if (!subd)
+ filename = ass_tracks[idx]->name;
+#endif
mp_msg(MSGT_CPLAYER, MSGL_STATUS,
"SUB: Removed subtitle file (%d): %s\n", idx + 1,
- filename_recode(subd->filename));
+ filename_recode(filename));
sub_free(subd);
subs[idx] = NULL;
#ifdef CONFIG_ASS