diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2016-03-30 08:21:07 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2016-03-30 08:21:07 -0700 |
| commit | 6960c524c26e87cc97d3778016d7c57d86481081 (patch) | |
| tree | f852bcc276ced04539f5a1f88d9bfc1c887ac55a | |
| parent | e66a34bc6be4591f13298d65c16b302f76080be5 (diff) | |
361.42361.42
| -rw-r--r-- | doc/version.mk | 2 | ||||
| -rw-r--r-- | samples/version.mk | 2 | ||||
| -rw-r--r-- | src/gtk+-2.x/ctkconfig.c | 13 | ||||
| -rw-r--r-- | src/libXNVCtrl/version.mk | 2 | ||||
| -rw-r--r-- | src/version.h | 2 | ||||
| -rw-r--r-- | src/version.mk | 2 | ||||
| -rw-r--r-- | version.mk | 2 |
7 files changed, 19 insertions, 6 deletions
diff --git a/doc/version.mk b/doc/version.mk index 9b784b4..7c2264d 100644 --- a/doc/version.mk +++ b/doc/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 361.28 +NVIDIA_VERSION = 361.42 diff --git a/samples/version.mk b/samples/version.mk index 9b784b4..7c2264d 100644 --- a/samples/version.mk +++ b/samples/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 361.28 +NVIDIA_VERSION = 361.42 diff --git a/src/gtk+-2.x/ctkconfig.c b/src/gtk+-2.x/ctkconfig.c index b07b6e8..5ac361c 100644 --- a/src/gtk+-2.x/ctkconfig.c +++ b/src/gtk+-2.x/ctkconfig.c @@ -748,6 +748,10 @@ static void enabled_renderer_func(GtkTreeViewColumn *tree_column, column = GPOINTER_TO_INT(data); gtk_tree_model_get(model, iter, column, &timer_config, -1); + if (timer_config == NULL) { + return; + } + value = timer_config->user_enabled; g_object_set(GTK_CELL_RENDERER(cell), "active", value, NULL); } @@ -765,6 +769,10 @@ static void description_renderer_func(GtkTreeViewColumn *tree_column, column = GPOINTER_TO_INT(data); gtk_tree_model_get(model, iter, column, &timer_config, -1); + if (timer_config == NULL) { + return; + } + value = timer_config->description; g_object_set(GTK_CELL_RENDERER(cell), "text", value, NULL); } @@ -781,6 +789,11 @@ static void time_interval_renderer_func(GtkTreeViewColumn *tree_column, gchar str[32]; gtk_tree_model_get(model, iter, column, &timer_config, -1); + + if (timer_config == NULL) { + return; + } + value = timer_config->interval; snprintf(str, 32, "%d ms", value); diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk index 9b784b4..7c2264d 100644 --- a/src/libXNVCtrl/version.mk +++ b/src/libXNVCtrl/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 361.28 +NVIDIA_VERSION = 361.42 diff --git a/src/version.h b/src/version.h index c750c37..b0e8d2f 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define NVIDIA_VERSION "361.28" +#define NVIDIA_VERSION "361.42" diff --git a/src/version.mk b/src/version.mk index 9b784b4..7c2264d 100644 --- a/src/version.mk +++ b/src/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 361.28 +NVIDIA_VERSION = 361.42 @@ -1 +1 @@ -NVIDIA_VERSION = 361.28 +NVIDIA_VERSION = 361.42 |