From e08687e1e2d9cb84b47398c68ff971dd063fa7ed Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 2 Oct 2013 19:35:53 +0200 Subject: [PATCH] team: do not g_source_remove after g_child_watch_add signal was emitted g_child_watch_add only emits one signal and gets automatically removed from the source. No need for double removal, so unset teamd_process_watch before calling teamd_cleanup. Signed-off-by: Thomas Haller --- src/devices/nm-device-team.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/devices/nm-device-team.c b/src/devices/nm-device-team.c index e7931e4cee..1b3b0c0ab2 100644 --- a/src/devices/nm-device-team.c +++ b/src/devices/nm-device-team.c @@ -347,7 +347,10 @@ teamd_process_watch_cb (GPid pid, gint status, gpointer user_data) NMDevice *dev = NM_DEVICE (user_data); NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (dev); + g_return_if_fail (priv->teamd_process_watch); + nm_log_info (LOGD_TEAM, "(%s): teamd died", nm_device_get_iface (dev)); + priv->teamd_process_watch = 0; priv->teamd_pid = 0; teamd_cleanup (dev, TRUE); }