[vlc-commits] commit: Don' t inhibit the screensaver if no-disable-screensaver is specified. ( Hugo Beauzee-Luyssen )

[git at videolan.org]

vlc | branch: master | Hugo Beauzee-Luyssen <beauze.h at gmail.com> | Wed Mar 17 23:31:54 2010 +0100| [90f46a51bb4854c81e1e407a54f808d6192620ee] | committer: Rémi Denis-Courmont 

Don't inhibit the screensaver if no-disable-screensaver is specified.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=90f46a51bb4854c81e1e407a54f808d6192620ee
---

 src/video_output/window.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/video_output/window.c b/src/video_output/window.c
index a783df5..a8ef797 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -80,7 +80,7 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
     }
 
     /* Hook for screensaver inhibition */
-    if (cfg->type == VOUT_WINDOW_TYPE_XID) {
+    if ( var_InheritBool( obj, "disable-screensaver" ) && cfg->type == VOUT_WINDOW_TYPE_XID) {
         w->inhibit = vlc_inhibit_Create (VLC_OBJECT (window),
                                          window->handle.xid);
         if (w->inhibit != NULL)