diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-07 16:28:18 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-07 17:07:12 +0200 |
| commit | f07dca941dc327e11c4252688020d5fd0b9b3567 (patch) | |
| tree | 1318709038e63c06c3697226dd9b480ebeb35aef | |
| parent | 7b5251b35c23a625959aac9a1ff617a955b3daa3 (diff) | |
| download | NetworkManager-f07dca941dc327e11c4252688020d5fd0b9b3567.tar.gz | |
ppp: unexport NMPPPManager instance on dispose()
Let's explicitly unexports on dispose(). Probably that already
happened, because NMExportedObject asserts that it is unexported
during !quitting.
During quitting, we probably don't tear down the manager.
Anyway, we should always unexport.
| -rw-r--r-- | src/ppp/nm-ppp-manager.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c index 37d7a464a0..fd0b991490 100644 --- a/src/ppp/nm-ppp-manager.c +++ b/src/ppp/nm-ppp-manager.c @@ -1234,8 +1234,12 @@ static void dispose (GObject *object) { NMPPPManager *self = (NMPPPManager *) object; + NMExportedObject *exported = NM_EXPORTED_OBJECT (self); NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (self); + if (nm_exported_object_is_exported (exported)) + nm_exported_object_unexport (exported); + _ppp_cleanup (self); _ppp_kill (self); |