From 8e64c4fa764be317304ff8b38b6b5c2cae75cc78 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 12 Apr 2018 15:47:40 +0200 Subject: [PATCH] manager: don't coalesce duplicate internal activations with different reasons When combining internal activations, do that only if their reason also matches. Fixes: 4985ca5ada9b9c24118b57c3288c5aa37c38ab81 (cherry picked from commit 786adf969c297fc2e830b43cc9e9b1a154d43216) --- src/nm-manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index 56011651ab..a176106249 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4083,7 +4083,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; }