diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-05-07 10:36:33 -0700 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-05-07 10:36:33 -0700 |
| commit | 0353fadd7cb54c1a5c15b64fde055fefb2da8b85 (patch) | |
| tree | 958a487440882240064c7f2f492702309d6e735f | |
| parent | 63733efd730316c0317a5df4f288aac242014d91 (diff) | |
| parent | 1d74de996c9c9cbd1686d6e9367c0a5571190fc3 (diff) | |
Merge pull request #1509 from ctiller/perform-callbacks
Cleanup unlock() a little
| -rw-r--r-- | src/core/transport/chttp2_transport.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index 885838ec5d..ea24796f35 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -824,12 +824,9 @@ static void unlock(transport *t) { /* gather any callbacks that need to be made */ if (!t->calling_back) { - perform_callbacks = prepare_callbacks(t); - if (perform_callbacks) { - t->calling_back = 1; - } + t->calling_back = perform_callbacks = prepare_callbacks(t); if (cb) { - if (t->error_state == ERROR_STATE_SEEN && !t->writing && !t->calling_back) { + if (t->error_state == ERROR_STATE_SEEN && !t->writing) { call_closed = 1; t->calling_back = 1; t->cb = NULL; /* no more callbacks */ |