X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fxscreensaver.c;h=c092777c58796c193463c85ee6c8a3d870cdf5e6;hp=1ac1d68c16da2ae8312631958807dd83b0c475a4;hb=7b34ef992563d7bcbb64cc5597dc45fa24470b05;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56

diff --git a/driver/xscreensaver.c b/driver/xscreensaver.c
index 1ac1d68c..c092777c 100644
--- a/driver/xscreensaver.c
+++ b/driver/xscreensaver.c
@@ -574,6 +574,9 @@ lock_initialization (saver_info *si, int *argc, char **argv)
         }
     }
 
+  if (si->prefs.debug_p)    /* But allow locking anyway in debug mode. */
+    si->locking_disabled_p = False;
+
 #endif /* NO_LOCKING */
 }
 
@@ -2124,6 +2127,10 @@ analyze_display (saver_info *si)
 #     endif
    }, { "DRI",		                        "DRI",
         True,  0
+   }, { "NV-CONTROL",                           "NVidia",
+        True,  0
+   }, { "NV-GLX",                               "NVidia GLX",
+        True,  0
    }, { "Apple-DRI",                            "Apple-DRI (XDarwin)",
         True,  0
    },