diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-01-04 14:18:02 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-01-05 18:36:46 +0100 |
| commit | 5f93f0101538db39efe0f9ea2316e63bff953bf0 (patch) | |
| tree | 23bc08bb81e145586be661e2ddb88613011cf52d | |
| parent | 0e164ac6076c855ea7263bdf2d31b3ec682c5a1f (diff) | |
| download | NetworkManager-5f93f0101538db39efe0f9ea2316e63bff953bf0.tar.gz | |
ppp-manager: clear @ppp_watch_id upon pppd termination
Set @ppp_watch_id to zero upon pppd termination, otherwise the call to
g_source_remove(priv->ppp_watch_id) in dispose() could trigger a failed
assertion.
| -rw-r--r-- | src/ppp-manager/nm-ppp-manager.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index ddf4c1e5da..49f7075347 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -800,6 +800,7 @@ ppp_watch_cb (GPid pid, gint status, gpointer user_data) nm_log_dbg (LOGD_PPP, "pppd pid %d cleaned up", priv->pid); priv->pid = 0; + priv->ppp_watch_id = 0; g_signal_emit (manager, signals[STATE_CHANGED], 0, NM_PPP_STATUS_DEAD); } |