update
This commit is contained in:
parent
f80b89a687
commit
b114db2213
2 changed files with 4 additions and 3 deletions
|
@ -785,7 +785,8 @@ protected:
|
|||
// If it is valid, check to see if the group is mutually exclusive or
|
||||
// not, then mark it accordingly
|
||||
if (any_exec->callback_group->type_ == \
|
||||
callback_group::CallbackGroupType::MutuallyExclusive) {
|
||||
callback_group::CallbackGroupType::MutuallyExclusive)
|
||||
{
|
||||
// It should not have been taken otherwise
|
||||
assert(any_exec->callback_group->can_be_taken_from_.load());
|
||||
// Set to false to indicate something is being run from this group
|
||||
|
|
|
@ -66,8 +66,8 @@ signal_handler(int signal_value)
|
|||
if (
|
||||
old_action.sa_handler != NULL && // Is set
|
||||
old_action.sa_handler != SIG_DFL && // Is not default
|
||||
old_action.sa_handler != SIG_IGN // Is not ignored
|
||||
) {
|
||||
old_action.sa_handler != SIG_IGN) // Is not ignored
|
||||
{
|
||||
old_action.sa_handler(signal_value);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue