summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/version.mk2
-rw-r--r--samples/version.mk2
-rw-r--r--src/gtk+-2.x/ctkframelock.c8
-rw-r--r--src/libXNVCtrl/libXNVCtrl.abin0 -> 18368 bytes
-rw-r--r--src/version.mk2
-rw-r--r--version.mk2
6 files changed, 10 insertions, 6 deletions
diff --git a/doc/version.mk b/doc/version.mk
index 7bb1d83..2f25f81 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 331.89
+NVIDIA_VERSION = 331.104
diff --git a/samples/version.mk b/samples/version.mk
index 7bb1d83..2f25f81 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 331.89
+NVIDIA_VERSION = 331.104
diff --git a/src/gtk+-2.x/ctkframelock.c b/src/gtk+-2.x/ctkframelock.c
index fe43a31..b5fb619 100644
--- a/src/gtk+-2.x/ctkframelock.c
+++ b/src/gtk+-2.x/ctkframelock.c
@@ -3715,8 +3715,12 @@ static void list_entry_update_gpu_status(CtkFramelock *ctk_framelock,
&house);
}
- has_client = has_client_selected(entry);
- has_server = has_server_selected(entry);
+ /*
+ * Iterate over this GPU's children (list of displays) to determine
+ * if any child is selected as a framelock client or server.
+ */
+ has_client = has_client_selected(entry->children);
+ has_server = has_server_selected(entry->children);
/* Update the Timing LED:
*
diff --git a/src/libXNVCtrl/libXNVCtrl.a b/src/libXNVCtrl/libXNVCtrl.a
new file mode 100644
index 0000000..a0b1b3e
--- /dev/null
+++ b/src/libXNVCtrl/libXNVCtrl.a
Binary files differ
diff --git a/src/version.mk b/src/version.mk
index 7bb1d83..2f25f81 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 331.89
+NVIDIA_VERSION = 331.104
diff --git a/version.mk b/version.mk
index 7bb1d83..2f25f81 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 331.89
+NVIDIA_VERSION = 331.104