luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-23 22:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

gpollfilemonitor: don't emit after cancellation

Browse Source 
GPollFileMonitor emits CHANGES_DONE_HINT after CHANGED signals, but it
doesn't check to ensure that the file monitor wasn't cancelled before it
does that.

If the original signal caused the monitor to be unreffed, cancelled and
destroyed, we would still end up emitting an extra signal on it.

Avoid that by checking first for cancellation.

https://bugzilla.gnome.org/show_bug.cgi?id=739424
This commit is contained in:
Ryan Lortie 2015-03-26 16:29:19 -04:00 committed by Matthias Clasen
parent 16190d2dcd
commit 62e5ee5514
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gpollfilemonitor.c
View File

@ -131,7 +131,8 @@ got_new_info (GObject *source_object,
poll_monitor->file,
NULL, event);
/* We're polling so slowly anyway, so always emit the done hint */
if (event == G_FILE_MONITOR_EVENT_CHANGED)
if (!g_file_monitor_is_cancelled (G_FILE_MONITOR (poll_monitor)) &&
(event == G_FILE_MONITOR_EVENT_CHANGED))
g_file_monitor_emit_event (G_FILE_MONITOR (poll_monitor),
poll_monitor->file,
NULL, G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT);