Don't try to set up the server with a main loop if there's no server

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / event.c

diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index 1cbda23..859d399 100644 (file)
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -64,9 +64,8 @@ switch_main_context (GMainContext *cnx)
 {
   GList *list;
 
-#ifndef DISABLE_P2P
-  atspi_dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
-#endif
+  if (spi_global_app_data->server)
+    atspi_dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
   atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, cnx);
   for (list = spi_global_app_data->direct_connections; list; list = list->next)
     atspi_dbus_connection_setup_with_g_main (list->data, cnx);