colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

team: do not g_source_remove after g_child_watch_add signal was emitted

Browse Source 
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 <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2013-10-02 19:35:53 +02:00
parent 67789cd476
commit e08687e1e2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/devices/nm-device-team.c
View File

@@ -347,7 +347,10 @@ teamd_process_watch_cb (GPid pid, gint status, gpointer user_data)
NMDevice *dev = NM_DEVICE (user_data); NMDevice *dev = NM_DEVICE (user_data);
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (dev); 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)); nm_log_info (LOGD_TEAM, "(%s): teamd died", nm_device_get_iface (dev));
priv->teamd_process_watch = 0;
priv->teamd_pid = 0; priv->teamd_pid = 0;
teamd_cleanup (dev, TRUE); teamd_cleanup (dev, TRUE);
} }