summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-03-16 16:14:23 +0100
committerThomas Haller <thaller@redhat.com>2017-03-16 18:27:33 +0100
commit9395f163f46d925b1de51f591e1f27f94cab2d67 (patch)
tree0f22f253bfba313cce203577110bdca740b3896d
parent72de503d3918506b17caba3265c593f433037d85 (diff)
downloadNetworkManager-9395f163f46d925b1de51f591e1f27f94cab2d67.tar.gz
manager: always cleanup volatile settings-connection on active-connection removal
This is not only relevant if the active connection is assumed/external.
-rw-r--r--src/nm-manager.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c
index c7e79c092a..0cd534f15f 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -271,8 +271,7 @@ active_connection_remove (NMManager *self, NMActiveConnection *active)
g_signal_handlers_disconnect_by_func (active, active_connection_default_changed, self);
g_signal_handlers_disconnect_by_func (active, active_connection_parent_active, self);
- if ( nm_active_connection_has_activation_type_assume_or_external (active)
- && (connection = nm_active_connection_get_settings_connection (active))
+ if ( (connection = nm_active_connection_get_settings_connection (active))
&& nm_settings_connection_get_volatile (connection))
g_object_ref (connection);
else