diff options
Diffstat (limited to 'src/libcharon/bus/bus.c')
| -rw-r--r-- | src/libcharon/bus/bus.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libcharon/bus/bus.c b/src/libcharon/bus/bus.c index ab8d0fc48..9abc07598 100644 --- a/src/libcharon/bus/bus.c +++ b/src/libcharon/bus/bus.c @@ -227,13 +227,20 @@ static bool log_cb(entry_t *entry, log_data_t *data) { entry->blocker = FALSE; entry->condvar->signal(entry->condvar); +<<<<<<< HEAD +======= + entry->calling--; +>>>>>>> upstream/4.5.1 } else { entry_destroy(entry); } va_end(args); +<<<<<<< HEAD entry->calling--; +======= +>>>>>>> upstream/4.5.1 return TRUE; } va_end(args); |