334.21334.21

8 files changed, 29 insertions, 14 deletions

diff --git a/doc/version.mk b/doc/version.mk
index 591ef07..434103e 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 334.16
+NVIDIA_VERSION = 334.21
diff --git a/samples/version.mk b/samples/version.mk
index 591ef07..434103e 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 334.16
+NVIDIA_VERSION = 334.21
diff --git a/src/gtk+-2.x/ctkcolorcorrection.c b/src/gtk+-2.x/ctkcolorcorrection.c
index 6fe089e..d8d7e26 100644
--- a/src/gtk+-2.x/ctkcolorcorrection.c
+++ b/src/gtk+-2.x/ctkcolorcorrection.c
@@ -180,6 +180,12 @@ static void ctk_color_correction_finalize(GObject *object)
 {
     CtkColorCorrection *ctk_object = CTK_COLOR_CORRECTION(object);
 
+    /* kill the timer */
+    if (ctk_object->confirm_timer) {
+        g_source_remove(ctk_object->confirm_timer);
+        ctk_object->confirm_timer = 0;
+    }
+
     g_signal_handlers_disconnect_matched(G_OBJECT(ctk_object->ctk_event),
                                          G_SIGNAL_MATCH_DATA,
                                          0,
diff --git a/src/gtk+-2.x/ctkframelock.c b/src/gtk+-2.x/ctkframelock.c
index debc66a..769feec 100644
--- a/src/gtk+-2.x/ctkframelock.c
+++ b/src/gtk+-2.x/ctkframelock.c
@@ -3756,12 +3756,15 @@ static void list_entry_update_display_status(CtkFramelock *ctk_framelock,
 {
     nvDisplayDataPtr data = (nvDisplayDataPtr)(entry->data);
     gboolean framelock_enabled;
+    gboolean stereo_enabled = FALSE;
     gboolean is_server;
     gboolean is_client;
     gboolean gpu_is_server;
     gboolean use_house_sync;
     nvListTreePtr tree = (nvListTreePtr)(ctk_framelock->tree);
     nvListEntryPtr gpu_server_entry = get_gpu_server_entry(tree);
+    ReturnStatus ret;
+    int val;
 
     framelock_enabled = ctk_framelock->framelock_enabled;
 
@@ -3776,11 +3779,18 @@ static void list_entry_update_display_status(CtkFramelock *ctk_framelock,
 
     gpu_is_server = (gpu_server_entry && (gpu_server_entry == entry->parent));
 
-    /* Check Stereo Sync.  If frame lock is disabled or this display device
-     * is neither a client/server or the display device is a server and the
-     * GPU driving it is not using the house sync signal, gray out the LED.
+    ret = NvCtrlGetAttribute(ctk_framelock->attribute_handle, NV_CTRL_STEREO,
+                             &val);
+    if ((ret == NvCtrlSuccess) &&
+        (val != NV_CTRL_STEREO_OFF)) {
+        stereo_enabled = TRUE;
+    }
+
+    /* Check Stereo Sync.  If stereo or frame lock is disabled or this display
+     * device is neither a client/server or the display device is a server and
+     * the GPU driving it is not using the house sync signal, gray out the LED.
      */
-    if (!framelock_enabled ||
+    if (!framelock_enabled || !stereo_enabled ||
         (!is_server && !is_client) ||
         (is_server && gpu_is_server && !use_house_sync)) {
         gtk_widget_set_sensitive(data->stereo_label, FALSE);
@@ -3794,8 +3804,6 @@ static void list_entry_update_display_status(CtkFramelock *ctk_framelock,
         if (entry->parent) {
             GdkPixbuf *pixbuf = ctk_framelock->led_grey_pixbuf;
             nvGPUDataPtr gpu_data = (nvGPUDataPtr)(entry->parent->data);
-            ReturnStatus ret;
-            int val;
 
             ret = NvCtrlGetAttribute(gpu_data->handle, NV_CTRL_FRAMELOCK_TIMING,
                                      &val);
diff --git a/src/libXNVCtrl/NVCtrl.h b/src/libXNVCtrl/NVCtrl.h
index 20af156..8436643 100644
--- a/src/libXNVCtrl/NVCtrl.h
+++ b/src/libXNVCtrl/NVCtrl.h
@@ -341,7 +341,8 @@
 #define NV_CTRL_STEREO_3D_VISION                                10
 #define NV_CTRL_STEREO_3D_VISION_PRO                            11
 #define NV_CTRL_STEREO_HDMI_3D                                  12
-#define NV_CTRL_STEREO_MAX NV_CTRL_STEREO_HDMI_3D
+#define NV_CTRL_STEREO_TRIDELITY_SL                             13
+#define NV_CTRL_STEREO_MAX NV_CTRL_STEREO_TRIDELITY_SL
 
 /*
  * NV_CTRL_EMULATE - controls OpenGL software emulation of future
diff --git a/src/query-assign.c b/src/query-assign.c
index 845f010..a6401c2 100644
--- a/src/query-assign.c
+++ b/src/query-assign.c
@@ -3639,7 +3639,7 @@ static ReturnStatus get_framelock_sync_state(NvCtrlAttributeHandle *t,
                                              int *enabled)
 {
     NVCTRLAttributePermissionsRec perms;
-    ReturnStatus status;
+    Bool status;
     int permBit;
     int target_type = NvCtrlGetTargetType (t);
 
@@ -3667,8 +3667,8 @@ query:
     status = XNVCTRLQueryAttributePermissions(h->dpy,
                                               NV_CTRL_FRAMELOCK_SYNC,
                                               &perms);
-    if (status != NvCtrlSuccess) {
-        return status;
+    if (!status) {
+        return NvCtrlError;
     }
 
     permBit = targetTypeTable[GPU_TARGET].permission_bit;
diff --git a/src/version.mk b/src/version.mk
index 591ef07..434103e 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 334.16
+NVIDIA_VERSION = 334.21
diff --git a/version.mk b/version.mk
index 591ef07..434103e 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 334.16
+NVIDIA_VERSION = 334.21