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

libnm: complete async result in got_object_manager() also when cancelled

Browse source 
Cancelling an operation shall not mean to not invoke the result callback.
The result callback is *always* to be invoked.

(cherry picked from commit c5a48b7a0b)
This commit is contained in:
Thomas Haller 2017-06-15 19:13:53 +02:00
parent 2236c3c728
commit b071e9ade7
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libnm/nm-client.c
View file

@ -2424,10 +2424,8 @@ got_object_manager (GObject *object, GAsyncResult *result, gpointer user_data)
object_manager = g_dbus_object_manager_client_new_for_bus_finish (result, &error);
if (object_manager == NULL) {
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
g_simple_async_result_take_error (init_data->result, error);
init_async_complete (init_data);
}
g_simple_async_result_take_error (init_data->result, error);
init_async_complete (init_data);
return;
}