diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-18 20:40:18 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-18 20:40:18 +0000 |
| commit | 8c613ceb2c46e418f1f0d9909cb0295ab23e5717 (patch) | |
| tree | 3c8add85848ead8af4ca40610cb37d14f9458e58 | |
| parent | d28e2d28f523b23e725c5a1a264b07d207aa3a08 (diff) | |
Merged revisions 75748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r75748 | tilghman | 2007-07-18 15:31:36 -0500 (Wed, 18 Jul 2007) | 2 lines
Store prior to copy (closes issue #10193)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@75749 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index c3827747d..fe44aafa3 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3132,6 +3132,13 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ ast_unlock_path(dir); #ifndef IMAP_STORAGE + /* We must store the file first, before copying the message, because + * ODBC storage does the entire copy with SQL. + */ + if (ast_fileexists(fn, NULL, NULL) > 0) { + STORE(dir, vmu->mailbox, vmu->context, msgnum, chan, vmu, fmt, duration, vms); + } + /* Are there to be more recipients of this message? */ while (tmpptr) { struct ast_vm_user recipu, *recip; @@ -3149,8 +3156,8 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ } } #endif + /* Notification and disposal needs to happen after the copy, though. */ if (ast_fileexists(fn, NULL, NULL)) { - STORE(dir, vmu->mailbox, vmu->context, msgnum, chan, vmu, fmt, duration, vms); notify_new_message(chan, vmu, msgnum, duration, fmt, S_OR(chan->cid.cid_num, NULL), S_OR(chan->cid.cid_name, NULL)); DISPOSE(dir, msgnum); } |