Merge branch 'threaded-resolver-assertion-fix' into 'main'

gthreadedresolver: Remove some incorrect assertions

See merge request GNOME/glib!3405
This commit is contained in:
Michael Catanzaro 2023-04-27 15:56:45 +00:00
commit 91af1c180a

View File

@ -1439,7 +1439,6 @@ timeout_cb (gpointer user_data)
/* Signal completion of the task. */
g_mutex_lock (&data->lock);
g_assert (!data->has_returned);
data->has_returned = TRUE;
g_cond_broadcast (&data->cond);
g_mutex_unlock (&data->lock);
@ -1470,7 +1469,6 @@ cancelled_cb (GCancellable *cancellable,
/* Signal completion of the task. */
g_mutex_lock (&data->lock);
g_assert (!data->has_returned);
data->has_returned = TRUE;
g_cond_broadcast (&data->cond);
g_mutex_unlock (&data->lock);
@ -1605,7 +1603,6 @@ threaded_resolver_worker_cb (gpointer task_data,
/* Signal completion of a task. */
g_mutex_lock (&data->lock);
g_assert (!data->has_returned);
data->has_returned = TRUE;
g_cond_broadcast (&data->cond);
g_mutex_unlock (&data->lock);