diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-07-03 18:25:30 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-07-03 18:25:30 +0000 |
| commit | 8a53d595a5113f70b677bba1abed6106103b7492 (patch) | |
| tree | c57b8972de82cc3c6440ee7f544526ace4b86acf /apps | |
| parent | 8b93f50dfc57aabbf5249620a9d736b80d3ab4de (diff) | |
Fix up the device state processing thread in app_queue so that it's not
possible for there to be entries in the queue and the thread is just sleeping
(Thanks to mmichelson for bringing the problem to my attention)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73127 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_queue.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 85f1b6efe..425f3c64a 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -631,8 +631,10 @@ static void *device_state_thread(void *data) while (!device_state.stop) { ast_mutex_lock(&device_state.lock); - ast_cond_wait(&device_state.cond, &device_state.lock); - sc = AST_LIST_REMOVE_HEAD(&device_state.state_change_q, entry); + if (!(sc = AST_LIST_REMOVE_HEAD(&device_state.state_change_q, entry))) { + ast_cond_wait(&device_state.cond, &device_state.lock); + sc = AST_LIST_REMOVE_HEAD(&device_state.state_change_q, entry); + } ast_mutex_unlock(&device_state.lock); /* Check to see if we were woken up to see the request to stop */ |