diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2021-06-15 12:24:51 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2021-06-15 12:24:51 +0000 |
| commit | 031e5020ee80f6ae7fa43b5e4db2b53cfa8465d3 (patch) | |
| tree | f7f76bcd35adcfac916781ff97f74ce348873cdc | |
| parent | 7b6ccc8bdb3765528a573472ba298f1013af15dd (diff) | |
| parent | 838dc04c7674a197d3085ff785e13cd440324002 (diff) | |
| download | glib-031e5020ee80f6ae7fa43b5e4db2b53cfa8465d3.tar.gz | |
Merge branch 'wip/pwithnall/local-file-monitor-deadlock' into 'main'
glocalfilemonitor: Avoid a deadlock on finalization
See merge request GNOME/glib!2155
| -rw-r--r-- | gio/glocalfilemonitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c index eccab231c..dc32fb660 100644 --- a/gio/glocalfilemonitor.c +++ b/gio/glocalfilemonitor.c @@ -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))) |