diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-11-29 00:07:32 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-11-29 00:07:32 +0000 |
| commit | 8a3e984b0c4c681909f8b8940d020a4e1141e9a3 (patch) | |
| tree | 37963f25a365e5913a91c0fbcf3bb98b736234aa /main/file.c | |
| parent | 68f8257484e9eb95ebed4ebfb189dc0771765956 (diff) | |
Merged revisions 90142 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r90142 | russell | 2007-11-28 18:06:08 -0600 (Wed, 28 Nov 2007) | 4 lines
Merge a change from team/russell/chan_refcount ...
This makes ast_stopstream() thread-safe.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90143 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/file.c b/main/file.c index be5c019de..bbdda4c38 100644 --- a/main/file.c +++ b/main/file.c @@ -119,6 +119,8 @@ int ast_format_unregister(const char *name) int ast_stopstream(struct ast_channel *tmp) { + ast_channel_lock(tmp); + /* Stop a running stream if there is one */ if (tmp->stream) { ast_closestream(tmp->stream); @@ -131,6 +133,9 @@ int ast_stopstream(struct ast_channel *tmp) ast_closestream(tmp->vstream); tmp->vstream = NULL; } + + ast_channel_unlock(tmp); + return 0; } |