From 28eec45dbb8fca7e51165b29cd6a36c7ef78abb4 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 3 May 2023 14:21:31 +0000 Subject: shared-qmi: ensure cancellation is setup last in the registration wait register_in_network_cancelled() may be called early if the given cancellable is already cancelled, and if so, we want it to remove the timeout and signal handler, which should have been configured before setting up the cancellation signal handler. --- src/mm-shared-qmi.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mm-shared-qmi.c b/src/mm-shared-qmi.c index 8dc6e0108..236dbcf62 100644 --- a/src/mm-shared-qmi.c +++ b/src/mm-shared-qmi.c @@ -330,12 +330,6 @@ initiate_network_register_ready (QmiClientNas *client, * will cancel the others. */ - if (ctx->cancellable) - ctx->cancellable_id = g_cancellable_connect (ctx->cancellable, - G_CALLBACK (register_in_network_cancelled), - task, - NULL); - ctx->serving_system_indication_id = g_signal_connect_swapped (client, "serving-system", G_CALLBACK (register_in_network_ready), @@ -345,6 +339,15 @@ initiate_network_register_ready (QmiClientNas *client, (GSourceFunc) register_in_network_timeout, task); + /* The cancellable may already be cancelled, and if so the given callback will be called + * right away. So make sure this cancellable is always configured last, so that it clears the + * timeout or signal handler upon early cancellation. */ + if (ctx->cancellable) + ctx->cancellable_id = g_cancellable_connect (ctx->cancellable, + G_CALLBACK (register_in_network_cancelled), + task, + NULL); + out: if (output) -- cgit v1.2.1