summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormplayer-svn <svn@mplayerhq.hu>2011-09-06 20:39:06 +0000
committerwm4 <wm4@nowhere>2012-08-03 01:26:32 +0200
commit9c76680dfb927518932b9f817b5ff2c2c24c083e (patch)
treea0a56da840aac34b21423d2be09c1bfc88765b14
parent335c6259d2f2460e9a0e4d7fbc885cab2d70b114 (diff)
downloadmpv-9c76680dfb927518932b9f817b5ff2c2c24c083e.tar.bz2
mpv-9c76680dfb927518932b9f817b5ff2c2c24c083e.tar.xz
x11: make the stop-xscreensaver option behave as described in the man page
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34074 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
-rw-r--r--libvo/x11_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 3390c52d76..edf32792ee 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -1557,7 +1557,7 @@ static void saver_off(Display * mDisplay)
{
int nothing;
- if (screensaver_off)
+ if (!stop_xscreensaver || screensaver_off)
return;
screensaver_off = 1;
if (xss_suspend(mDisplay, True))