From e0c1aed520eb6360c22c630d3211e5b9916f2aad Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 16 Dec 2010 06:51:51 +0000 Subject: Merged revisions 298394 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r298394 | tilghman | 2010-12-15 18:30:04 -0600 (Wed, 15 Dec 2010) | 22 lines Merged revisions 298393 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r298393 | tilghman | 2010-12-15 18:29:10 -0600 (Wed, 15 Dec 2010) | 15 lines Merged revisions 298392 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r298392 | tilghman | 2010-12-15 18:28:04 -0600 (Wed, 15 Dec 2010) | 8 lines Unregister before shutting down the connection, to avoid a race. (closes issue #18481) Reported by: pabelanger Patches: 20101215__issue18481.diff.txt uploaded by tilghman (license 14) Tested by: pabelanger ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@298441 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cdr/cdr_sqlite.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cdr') diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c index a46902c9c..e21d33659 100644 --- a/cdr/cdr_sqlite.c +++ b/cdr/cdr_sqlite.c @@ -188,9 +188,10 @@ static int sqlite_log(struct ast_cdr *cdr) static int unload_module(void) { - if (db) - sqlite_close(db); ast_cdr_unregister(name); + if (db) { + sqlite_close(db); + } return 0; } -- cgit v1.2.3