Commit eac2b1a1 authored by Michael Catanzaro's avatar Michael Catanzaro

Merge branch 'wip/tingping/socket-cancellation' into 'master'

gsocketclient: Ensure task is always returned on cancel

Closes libsoup#132

See merge request !647
parents 0a2d4f6e 4dd15826
Pipeline #59240 passed with stages
in 10 minutes and 51 seconds
......@@ -1567,7 +1567,7 @@ g_socket_client_connected_callback (GObject *source,
GProxy *proxy;
const gchar *protocol;
if (g_cancellable_is_cancelled (attempt->cancellable) || task_completed_or_cancelled (data->task))
if (task_completed_or_cancelled (data->task) || g_cancellable_is_cancelled (attempt->cancellable))
{
g_object_unref (data->task);
connection_attempt_unref (attempt);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment