summaryrefslogtreecommitdiffstats
path: root/player/loadfile.c
diff options
context:
space:
mode:
Diffstat (limited to 'player/loadfile.c')
-rw-r--r--player/loadfile.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 6560fe7806..d9d6a0036c 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1317,26 +1317,24 @@ struct playlist_entry *mp_next_file(struct MPContext *mpctx, int direction,
while (next && next->playback_short)
next = next->prev;
// Always allow jumping to first file
- if (!next && mpctx->opts->loop_times < 0)
+ if (!next && mpctx->opts->loop_times == 1)
next = mpctx->playlist->first;
}
- if (!next && mpctx->opts->loop_times >= 0) {
+ if (!next && mpctx->opts->loop_times != 1) {
if (direction > 0) {
if (mpctx->opts->shuffle)
playlist_shuffle(mpctx->playlist);
next = mpctx->playlist->first;
- if (next && mpctx->opts->loop_times > 1) {
+ if (next && mpctx->opts->loop_times > 1)
mpctx->opts->loop_times--;
- if (mpctx->opts->loop_times == 1)
- mpctx->opts->loop_times = -1;
- }
} else {
next = mpctx->playlist->last;
// Don't jump to files that would immediately go to next file anyway
while (next && next->playback_short)
next = next->prev;
}
- if (!force && next && next->init_failed) {
+ bool ignore_failures = mpctx->opts->loop_times == -2;
+ if (!force && next && next->init_failed && !ignore_failures) {
// Don't endless loop if no file in playlist is playable
bool all_failed = true;
struct playlist_entry *cur;