]> Pileus Git - ~andy/gtk/commitdiff
Don't set the default display to NULL
authorMatthias Clasen <mclasen@redhat.com>
Tue, 18 Jan 2011 14:36:59 +0000 (09:36 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 18 Jan 2011 14:36:59 +0000 (09:36 -0500)
This was causing segfaults if DISPLAY is unset

gdk/x11/gdkdisplaymanager-x11.c

index dd712d9296cf2f79b7f024277c15f2c9c6a53cc2..fbd49464de238c187186fda3517ff9983a61fe6f 100644 (file)
@@ -53,7 +53,7 @@ gdk_x11_display_manager_open_display (GdkDisplayManager *manager,
   GdkDisplay *display;
 
   display = _gdk_x11_display_open (name);
-  if (manager_x11->default_display == NULL)
+  if (manager_x11->default_display == NULL && display != NULL)
     gdk_display_manager_set_default_display (manager, display);
 
   return display;