luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

kqueue: add a bit of extra paranoia on cancel

Browse Source 
Cancellation of GPollFileMonitor is now handled correctly (in the sense
that no further signals will follow) but let's be extra paranoid and
disconnect our handler anyway, for good measure.

https://bugzilla.gnome.org/show_bug.cgi?id=739424
This commit is contained in:
Ryan Lortie 2015-03-26 16:35:06 -04:00 committed by Matthias Clasen
parent a367921d44
commit 9e8f4d4736
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/kqueue/gkqueuefilemonitor.c
View File

@ -186,7 +186,10 @@ g_kqueue_file_monitor_cancel (GFileMonitor *monitor)
kqueue_monitor->sub = NULL; kqueue_monitor->sub = NULL;
} }
else if (kqueue_monitor->fallback) else if (kqueue_monitor->fallback)
{
g_signal_handlers_disconnect_by_func (kqueue_monitor->fallback, _fallback_callback, kqueue_monitor);
g_file_monitor_cancel (kqueue_monitor->fallback); g_file_monitor_cancel (kqueue_monitor->fallback);
}
if (G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel) if (G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel)
(*G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel) (monitor); (*G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel) (monitor);