]> git.sesse.net Git - vlc/commitdiff
Don't inhibit the screensaver if no-disable-screensaver is specified.
authorHugo Beauzee-Luyssen <beauze.h@gmail.com>
Wed, 17 Mar 2010 22:31:54 +0000 (23:31 +0100)
committerRémi Denis-Courmont <remi@remlab.net>
Fri, 26 Mar 2010 17:18:51 +0000 (19:18 +0200)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
src/video_output/window.c

index a783df5ff5f0c820229948f1da2a1cffe7c5586a..a8ef7976076f7d2dcf94f2cf232354dc60e47f7d 100644 (file)
@@ -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)