fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 03:40:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: fix cleanup after activation from editor

Browse source 
progress_activation_editor_cb() is called multiple times every 120
milliseconds and it must free resources only the last time.

Fixes: f0a2686545

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/51
(cherry picked from commit d091cbdc2f)
This commit is contained in:
Beniamino Galvani 2018-10-08 21:43:18 +02:00
parent 87baa2678a
commit fd3658e25f
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clients/cli/connections.c
View file

@ -6585,8 +6585,8 @@ static gboolean
progress_activation_editor_cb (gpointer user_data)
{
MonitorACInfo *info = (MonitorACInfo *) user_data;
gs_unref_object NMDevice *device = info->device;
gs_unref_object NMActiveConnection *ac = info->ac;
NMDevice *device = info->device;
NMActiveConnection *ac = info->ac;
NMActiveConnectionState ac_state;
NMDeviceState dev_state;
@ -6619,11 +6619,13 @@ progress_activation_editor_cb (gpointer user_data)
nm_object_get_path (NM_OBJECT (connection)));
}
return TRUE;
return G_SOURCE_CONTINUE;
finish:
nm_g_object_unref (device);
nm_g_object_unref (ac);
info->monitor_id = 0;
return FALSE;
return G_SOURCE_REMOVE;
}
static void