diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-04-12 15:47:40 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-04-12 15:57:39 +0200 |
| commit | 786adf969c297fc2e830b43cc9e9b1a154d43216 (patch) | |
| tree | 03d47a551a2a73819e686507d9249055f546a103 | |
| parent | 69b7a76dc27f71981b7eb68bcce134654eb6fe7d (diff) | |
manager: don't coalesce duplicate internal activations with different reasons
When combining internal activations, do that only if their reason also
matches.
Fixes: 4985ca5ada9b9c24118b57c3288c5aa37c38ab81
| -rw-r--r-- | src/nm-manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index 034675b9e8..c8fad9dbb7 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4193,7 +4193,8 @@ nm_manager_activate_connection (NMManager *self, && g_strcmp0 (nm_active_connection_get_specific_object (active), specific_object) == 0 && nm_active_connection_get_device (active) == device && nm_auth_subject_is_internal (nm_active_connection_get_subject (active)) - && nm_auth_subject_is_internal (subject)) + && nm_auth_subject_is_internal (subject) + && nm_active_connection_get_activation_reason (active) == activation_reason) return active; } |