fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 08:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: clear priv->queued_act_request before setting state

Browse source 
Setting the state of NMActiveConnection results in invoking callbacks
in NMManager. Hence, it might be far-reaching. Clear
priv->queued_act_request before invoking the callbacks.

(cherry picked from commit ecf3677e57)
This commit is contained in:
Thomas Haller 2018-02-05 20:43:08 +01:00
parent 1be09bfbe3
commit c7b1d4a2d3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/devices/nm-device.c
View file

@ -9879,10 +9879,12 @@ static void
_clear_queued_act_request (NMDevicePrivate *priv) _clear_queued_act_request (NMDevicePrivate *priv)
{ {
if (priv->queued_act_request) { if (priv->queued_act_request) {
nm_active_connection_set_state_fail ((NMActiveConnection *) priv->queued_act_request, gs_unref_object NMActRequest *ac = NULL;
ac = g_steal_pointer (&priv->queued_act_request);
nm_active_connection_set_state_fail ((NMActiveConnection *) ac,
NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED, NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED,
NULL); NULL);
g_clear_object (&priv->queued_act_request);
} }
} }