[at-spi2-core] Only flush a display if we have one



commit f0b979c8d448ff45c93afb9670f7decf6a2e3a04
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Apr 29 10:31:02 2011 -0400

    Only flush a display if we have one
    
    This was causing occasional segfaults in the gdm session.
    https://bugzilla.gnome.org/show_bug.cgi?id=648942

 bus/at-spi-bus-launcher.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
index 0d6b4b7..9300979 100644
--- a/bus/at-spi-bus-launcher.c
+++ b/bus/at-spi-bus-launcher.c
@@ -398,11 +398,12 @@ main (int    argc,
         XDeleteProperty (display,
                          XDefaultRootWindow (display),
                          bus_address_atom);
+
+        XFlush (display);
+        XCloseDisplay (display);
       }
-    XFlush (display);
-    XCloseDisplay (display);
   }
-    
+
   if (_global_app->a11y_launch_error_message)
     {
       g_printerr ("Failed to launch bus: %s", _global_app->a11y_launch_error_message);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]