summaryrefslogtreecommitdiffstats
path: root/player/loadfile.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-04-14 18:56:03 +0200
committerwm4 <wm4@nowhere>2017-04-14 18:58:48 +0200
commitb586bc2dbec6495e65ef1a34045f6d66a7112d9d (patch)
tree1696ea19a63d34516b3a9538659094119c51be63 /player/loadfile.c
parent419624fb068ed4e7f449fa4fd0dda8edf161ac1c (diff)
downloadmpv-b586bc2dbec6495e65ef1a34045f6d66a7112d9d.tar.bz2
mpv-b586bc2dbec6495e65ef1a34045f6d66a7112d9d.tar.xz
player: fix core-idle and eof-reached update notifcations
Make mpv_observe_property() work correctly on them even with --keep-open-pause=no. This also changes the situations in which the screensaver is enabled/disabled subtly.
Diffstat (limited to 'player/loadfile.c')
-rw-r--r--player/loadfile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 1542e16e49..1aa4c4a49d 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1281,6 +1281,9 @@ reopen_file:
terminate_playback:
+ mpctx->playback_active = false;
+ update_core_idle_state(mpctx);
+
process_unload_hooks(mpctx);
if (mpctx->stop_play == KEEP_PLAYING)
@@ -1306,7 +1309,6 @@ terminate_playback:
uninit_audio_out(mpctx);
mpctx->playback_initialized = false;
- update_screensaver_state(mpctx);
if (mpctx->stop_play == PT_RELOAD_FILE) {
mpctx->stop_play = KEEP_PLAYING;