diff options
| author | Benjamin Berg <bberg@redhat.com> | 2019-02-19 12:59:29 +0100 |
|---|---|---|
| committer | Benjamin Berg <bberg@redhat.com> | 2019-02-19 14:04:37 +0100 |
| commit | 3e079e87a5a67384aa05c894aa536507838f985a (patch) | |
| tree | 19a82a014af52f2b3d82eca76f1720659a8c36e2 | |
| parent | 27bc2cb22a6bdd3dc0c1ad2a67464939dcf53049 (diff) | |
| download | NetworkManager-3e079e87a5a67384aa05c894aa536507838f985a.tar.gz | |
device: Destroy P2P device with its parent Wifi device
This can for example happen when a wifi device is unmanaged.
| -rw-r--r-- | src/devices/wifi/nm-device-wifi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 6f23bf15cd..63eafe71bc 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -3396,6 +3396,12 @@ dispose (GObject *object) remove_all_aps (self); + if (priv->p2p_device) { + /* Destroy the P2P device. */ + g_object_remove_weak_pointer (G_OBJECT (priv->p2p_device), (gpointer*) &priv->p2p_device); + nm_device_wifi_p2p_remove (g_steal_pointer (&priv->p2p_device)); + } + G_OBJECT_CLASS (nm_device_wifi_parent_class)->dispose (object); } |