diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2015-06-23 08:57:52 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2015-06-23 08:57:52 -0700 |
| commit | 3dea66471f0385eb51dc9338923c1d3e9146d411 (patch) | |
| tree | 4a4c920904e90cd32af847e21f8deef086e6d74d | |
| parent | 7bfc8c88c877345bdcc14f6d8c3e6f14dd0b4639 (diff) | |
346.82346.82
| -rw-r--r-- | doc/version.mk | 2 | ||||
| -rw-r--r-- | samples/version.mk | 2 | ||||
| -rw-r--r-- | src/gtk+-2.x/ctkedid.c | 9 | ||||
| -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, 15 insertions, 6 deletions
diff --git a/doc/version.mk b/doc/version.mk index 22ff29a..753c69c 100644 --- a/doc/version.mk +++ b/doc/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 346.72 +NVIDIA_VERSION = 346.82 diff --git a/samples/version.mk b/samples/version.mk index 22ff29a..753c69c 100644 --- a/samples/version.mk +++ b/samples/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 346.72 +NVIDIA_VERSION = 346.82 diff --git a/src/gtk+-2.x/ctkedid.c b/src/gtk+-2.x/ctkedid.c index a957127..a681fcb 100644 --- a/src/gtk+-2.x/ctkedid.c +++ b/src/gtk+-2.x/ctkedid.c @@ -337,6 +337,15 @@ static void button_clicked(GtkButton *button, gpointer user_data) ctk_edid->file_format, data, len); } + /* + * Process pending GTK events here before destroying the filechooser + * to work around GTK dereferencing a NULL pointer during one of these + * events. See GNOME Bug 711321 + */ + while (gtk_events_pending()) { + gtk_main_iteration(); + } + gtk_widget_destroy(ctk_edid->file_selector); ctk_edid->file_selector = NULL; diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk index 22ff29a..753c69c 100644 --- a/src/libXNVCtrl/version.mk +++ b/src/libXNVCtrl/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 346.72 +NVIDIA_VERSION = 346.82 diff --git a/src/version.h b/src/version.h index c2b2df8..2b437bb 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define NVIDIA_VERSION "346.72" +#define NVIDIA_VERSION "346.82" diff --git a/src/version.mk b/src/version.mk index 22ff29a..753c69c 100644 --- a/src/version.mk +++ b/src/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 346.72 +NVIDIA_VERSION = 346.82 @@ -1 +1 @@ -NVIDIA_VERSION = 346.72 +NVIDIA_VERSION = 346.82 |