res_musiconhold: Don't restart MOH from beginning after announcement.

This reverts a problem introduced by the fix for ASTERISK_24329.
Now, when an announcement is played while waiting in a queue, music on
hold will not restart from the beginning of the sound file and will
instead pick up where it left off. However, the incorrect behavior in
ASTERISK_24329 is now present again; if an announcement X seconds
long is played when music on hold starts, music on hold will start X
seconds into the file.

ASTERISK-27774 #close
Reported by: lvl

Change-Id: I86b2885ee7063268f9b9747eddb788336ade989b

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 55b14c934243fc9dc508eced76cb7f567a2f0b86..1c8728cf70484262ee0a8a0dd58c6c2665b7416e 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -333,7 +333,6 @@ static int ast_moh_files_next(struct ast_channel *chan)
                }
        } else {
                state->announcement = 0;
-               state->samples = 0;
        }
 
        if (!state->class->total_files) {