Skip to content
Snippets Groups Projects
Commit bdf7cef9 authored by Simon McVittie's avatar Simon McVittie
Browse files

launch: Fix removal of signalfd GSource


signal_source and forward_signals_id were redundant. We only need one.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 105fbc5f
No related branches found
No related tags found
No related merge requests found
...@@ -454,7 +454,6 @@ main (int argc, ...@@ -454,7 +454,6 @@ main (int argc,
GError **error = &local_error; GError **error = &local_error;
g_autoptr(GPtrArray) env_prefix = NULL; g_autoptr(GPtrArray) env_prefix = NULL;
char **command_and_args; char **command_and_args;
guint forward_signals_id = 0;
g_autoptr(FILE) original_stdout = NULL; g_autoptr(FILE) original_stdout = NULL;
g_autoptr(GDBusConnection) session_bus = NULL; g_autoptr(GDBusConnection) session_bus = NULL;
g_autoptr(GDBusConnection) peer_connection = NULL; g_autoptr(GDBusConnection) peer_connection = NULL;
...@@ -853,8 +852,8 @@ out: ...@@ -853,8 +852,8 @@ out:
if (local_error != NULL) if (local_error != NULL)
g_warning ("%s", local_error->message); g_warning ("%s", local_error->message);
if (forward_signals_id > 0) if (signal_source > 0)
g_source_remove (forward_signals_id); g_source_remove (signal_source);
g_strfreev (forward_fds); g_strfreev (forward_fds);
g_free (opt_directory); g_free (opt_directory);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment