Store prior to copy (closes issue #10193)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@75748 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b292eb2fbbd761c8a209051fdc4c8e12df9ff1fa..5b31f41e606d0e06c0ad68674f3ee5ed3fa69574 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -2691,6 +2691,13 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
 
                                        ast_unlock_path(dir);
 
+                                       /* 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);
+                                       }
+
                                        /* Are there to be more recipients of this message? */
                                        while (tmpptr) {
                                                struct ast_vm_user recipu, *recip;
@@ -2707,8 +2714,9 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
                                                        free_user(recip);
                                                }
                                        }
+
+                                       /* Notification and disposal needs to happen after the copy, though. */
                                        if (ast_fileexists(fn, NULL, NULL) > 0) {
-                                               STORE(dir, vmu->mailbox, vmu->context, msgnum);
                                                notify_new_message(chan, vmu, msgnum, duration, fmt, chan->cid.cid_num, chan->cid.cid_name);
                                                DISPOSE(dir, msgnum);
                                        }