summaryrefslogtreecommitdiff
path: root/bus/at-spi-bus-launcher.c
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2018-10-05 06:41:27 +0200
committerJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2018-10-05 06:46:10 +0200
commit67f96e39622a597c10d68af0b919cdd82ed54fa6 (patch)
treee3cc65230ed9570f48ed6243cbe1012c0c307f97 /bus/at-spi-bus-launcher.c
parentae59b2667b7f6ebdc8f5d10d22f88c4f8884b691 (diff)
downloadat-spi2-core-67f96e39622a597c10d68af0b919cdd82ed54fa6.tar.gz
bus-launch: Fix bus provider fallback
Clear the error message when we attempt to launch the bus daemon or bus broker so that the message from the previous attempt isn't mistaken as another failure.
Diffstat (limited to 'bus/at-spi-bus-launcher.c')
-rw-r--r--bus/at-spi-bus-launcher.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
index 7572cb67..17f01c02 100644
--- a/bus/at-spi-bus-launcher.c
+++ b/bus/at-spi-bus-launcher.c
@@ -293,7 +293,9 @@ ensure_a11y_bus_daemon (A11yBusLauncher *app, char *config_path)
if (pipe (app->pipefd) < 0)
g_error ("Failed to create pipe: %s", strerror (errno));
-
+
+ g_clear_pointer (&app->a11y_launch_error_message, g_free);
+
if (!g_spawn_async (NULL,
argv,
NULL,
@@ -389,6 +391,8 @@ ensure_a11y_bus_broker (A11yBusLauncher *app, char *config_path)
if (listen (app->listenfd, 1024) < 0)
g_error ("Failed to listen on socket: %s", strerror(errno));
+ g_clear_pointer (&app->a11y_launch_error_message, g_free);
+
if (!g_spawn_async (NULL,
argv,
NULL,