summaryrefslogtreecommitdiffstats
path: root/player/loadfile.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-10-02 12:33:34 +0200
committerwm4 <wm4@nowhere>2016-10-02 12:33:34 +0200
commit39fc5e1deb0c5753e7123529e4dd5c750aed1e8d (patch)
tree92b460dc2802ccf34c3ea413370daa98428f7a1e /player/loadfile.c
parente3a57272a712542e739b97db31efebc4cc17c53a (diff)
downloadmpv-39fc5e1deb0c5753e7123529e4dd5c750aed1e8d.tar.bz2
mpv-39fc5e1deb0c5753e7123529e4dd5c750aed1e8d.tar.xz
player: make --stop-screensaver runtime-changeable
Move the screensaver enable/disable determination to a central place, and call it if the stop-screensaver property is changed. Also, do not stop the screensaver when in idle mode (i.e. no file is loaded). Fixes #3615.
Diffstat (limited to 'player/loadfile.c')
-rw-r--r--player/loadfile.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index ba0e0bd257..ec8ddd6004 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1123,6 +1123,7 @@ reopen_file:
mpctx->playback_initialized = true;
mp_notify(mpctx, MPV_EVENT_FILE_LOADED, NULL);
+ update_screensaver_state(mpctx);
if (mpctx->max_frames == 0) {
if (!mpctx->stop_play)
@@ -1177,6 +1178,7 @@ 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;