summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Ford <bford@digium.com>2018-04-13 14:32:48 -0500
committerBenjamin Keith Ford <bford@digium.com>2018-04-13 15:30:02 -0600
commit4aeec6100f994e57d2ed6da8d39fce51d8a29f13 (patch)
tree429538121e166e8fcc90ec8b4833153ea5907b51
parent96c4a57edf977d97851683f04774583de8e2342c (diff)
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
-rw-r--r--res/res_musiconhold.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 55b14c934..1c8728cf7 100644
--- 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) {