Merge branch 'wip/pwithnall/local-file-monitor-deadlock' into 'main'

glocalfilemonitor: Avoid a deadlock on finalization

See merge request GNOME/glib!2155
This commit is contained in:
Philip Withnall 2021-06-15 12:24:51 +00:00
commit 031e5020ee

View File

@ -555,8 +555,8 @@ g_file_monitor_source_dispatch (GSource *source,
g_file_monitor_source_update_ready_time (fms);
g_clear_object (&instance);
g_mutex_unlock (&fms->lock);
g_clear_object (&instance);
/* We now have our list of events to deliver */
while ((event = g_queue_pop_head (&event_queue)))