diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2014-08-12 08:34:02 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2014-08-12 08:34:02 -0700 |
| commit | f1f2c20454f136389da9b7501ef4a93734766edd (patch) | |
| tree | d8f426962dacdb667ac9811daffc448dc6dbf940 | |
| parent | 019685e366ad053c246a0734f3e0cf2af2eb2901 (diff) | |
340.32340.32
| -rw-r--r-- | doc/version.mk | 2 | ||||
| -rw-r--r-- | samples/version.mk | 2 | ||||
| -rw-r--r-- | src/gtk+-2.x/ctkframelock.c | 8 | ||||
| -rw-r--r-- | src/libXNVCtrl/version.mk | 2 | ||||
| -rw-r--r-- | src/version.mk | 2 | ||||
| -rw-r--r-- | version.mk | 2 |
6 files changed, 11 insertions, 7 deletions
diff --git a/doc/version.mk b/doc/version.mk index a7b8a27..742cdd0 100644 --- a/doc/version.mk +++ b/doc/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 340.24 +NVIDIA_VERSION = 340.32 diff --git a/samples/version.mk b/samples/version.mk index a7b8a27..742cdd0 100644 --- a/samples/version.mk +++ b/samples/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 340.24 +NVIDIA_VERSION = 340.32 diff --git a/src/gtk+-2.x/ctkframelock.c b/src/gtk+-2.x/ctkframelock.c index 688ffe2..ca04b98 100644 --- a/src/gtk+-2.x/ctkframelock.c +++ b/src/gtk+-2.x/ctkframelock.c @@ -3705,8 +3705,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/version.mk b/src/libXNVCtrl/version.mk index a7b8a27..742cdd0 100644 --- a/src/libXNVCtrl/version.mk +++ b/src/libXNVCtrl/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 340.24 +NVIDIA_VERSION = 340.32 diff --git a/src/version.mk b/src/version.mk index a7b8a27..742cdd0 100644 --- a/src/version.mk +++ b/src/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 340.24 +NVIDIA_VERSION = 340.32 @@ -1 +1 @@ -NVIDIA_VERSION = 340.24 +NVIDIA_VERSION = 340.32 |