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

Merge branch 'G_SIGNAL_RUN_CLEANUP_do_not_call_accumulate' into 'master'

Browse Source 
Run the accumulator function for RUN_CLEANUP object handlers too

Closes #512

See merge request GNOME/glib!1053
This commit is contained in:
Philip Withnall
2019-08-26 06:19:07 +00:00
parent 36a9b2f923 153ac4c82a
commit 12bd86a2ee
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gobject/gsignal.c
View File

@@ -3759,9 +3759,14 @@ signal_emit_unlocked_R (SignalNode *node,
node->n_params + 1,
instance_and_params,
&emission.ihint);
if (!accumulate (&emission.ihint, emission_return, &accu, accumulator) &&
emission.state == EMISSION_RUN)
emission.state = EMISSION_STOP;
if (need_unset)
g_value_unset (&accu);
SIGNAL_LOCK ();
return_value_altered = TRUE;
emission.chain_type = G_TYPE_NONE;
if (emission.state == EMISSION_RESTART)