diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-01-13 03:06:24 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-01-13 03:06:24 +0000 |
| commit | 2a5df21d5f90bbf55a8d2682e47dd2fa589c4de7 (patch) | |
| tree | 1406754d75e8dca2ab706a21a887ea333fedddf4 /res/res_snmp.c | |
| parent | cece8001dd54dbaa284a76c778a7f72d5ea020e4 (diff) | |
Merged revisions 50674 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r50674 | file | 2007-01-12 22:04:55 -0500 (Fri, 12 Jan 2007) | 2 lines
Only join the snmp thread on an unload if the thread is actually running. (issue #8810 reported by junky)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_snmp.c')
| -rw-r--r-- | res/res_snmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_snmp.c b/res/res_snmp.c index 2ccadc407..cbca08a41 100644 --- a/res/res_snmp.c +++ b/res/res_snmp.c @@ -106,7 +106,7 @@ static int unload_module(void) ast_verbose(VERBOSE_PREFIX_1 "Unloading [Sub]Agent Module\n"); res_snmp_dont_stop = 0; - return pthread_join(thread, NULL); + return ((thread != AST_PTHREADT_NULL) ? pthread_join(thread, NULL) : 0); } static int reload(void) |