gtkutil.c (xg_display_open): Assign a value to gdpy_def, check

that gdpy is set.

2 files changed, 11 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 56aee19e439..a2c8f43e926 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-23  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_display_open): Assign a value to gdpy_def, check
+	that gdpy is set.
+
 2009-03-22  Alan Mackenzie  <acm@muc.de>
 
 	* callint.c (Finteractive): Clarify the doc string - even
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 8e3e24b6225..6d73c0358f0 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -119,9 +119,12 @@ xg_display_open (display_name, dpy)
   GdkDisplay *gdpy;
 
   gdpy = gdk_display_open (display_name);
-  if (!gdpy_def)
-    gdk_display_manager_set_default_display (gdk_display_manager_get (),
-					     gdpy);
+  if (!gdpy_def && gdpy)
+    {
+      gdpy_def = gdpy;
+      gdk_display_manager_set_default_display (gdk_display_manager_get (),
+					       gdpy);
+    }
 
   *dpy = gdpy ? GDK_DISPLAY_XDISPLAY (gdpy) : NULL;
   return gdpy != NULL;