luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-21 08:28:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

GMain: simplify logic for g_wakeup_acknowledge()

Browse Source 
Instead of messing around with context->poll_waiting, just look at the
GPollFD to see if the GWakeup needs to be acknowledged.
This commit is contained in:
Ryan Lortie
2011-08-31 22:07:02 -04:00
parent 87880dfa57
commit 7eae486179
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
glib/gmain.c
View File

@@ -2839,12 +2839,11 @@ g_main_context_check (GMainContext *context,
UNLOCK_CONTEXT (context); UNLOCK_CONTEXT (context);
return FALSE; return FALSE;
} }
if (!context->poll_waiting) if (context->wake_up_rec.events)
g_wakeup_acknowledge (context->wakeup); g_wakeup_acknowledge (context->wakeup);
else context->poll_waiting = FALSE;
context->poll_waiting = FALSE;
/* If the set of poll file descriptors changed, bail out /* If the set of poll file descriptors changed, bail out
* and let the main loop rerun * and let the main loop rerun