summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-08-03 19:14:30 +0200
committerwm4 <wm4@nowhere>2014-08-03 20:30:39 +0200
commit0ddbf92d067e342ef58fbd60e1c4871feba83ea5 (patch)
treef2b4fe73434be93a5e39c2563e9c6474ad53def7
parent575314eafa72f7389686bdb85dff4a104a654856 (diff)
downloadmpv-0ddbf92d067e342ef58fbd60e1c4871feba83ea5.tar.bz2
mpv-0ddbf92d067e342ef58fbd60e1c4871feba83ea5.tar.xz
player: make quit exit immediately
Stopping playback canceled waiting, but executed the remainder of the playloop, including things like executing pointless seeks.
-rw-r--r--player/playloop.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/player/playloop.c b/player/playloop.c
index 7d3309a583..f8904af028 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -940,8 +940,10 @@ void run_playloop(struct MPContext *mpctx)
}
+ handle_loop_file(mpctx);
+
if (mpctx->stop_play)
- mpctx->sleeptime = 0;
+ return;
handle_osd_redraw(mpctx);
@@ -960,8 +962,6 @@ void run_playloop(struct MPContext *mpctx)
handle_sstep(mpctx);
- handle_loop_file(mpctx);
-
handle_chapter_change(mpctx);
handle_force_window(mpctx, false);