From: Nathan Neulinger <nneul@neulinger.org>
Date: Wed, 24 Jul 2013 15:14:08 +0000 (-0500)
Subject: FS-5636 --resolve hold active lines when receiving a call
X-Git-Tag: v1.4.1~19^2~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12fab353f30e6ca71fdae4531110956eaea0aefb;p=thirdparty%2Ffreeswitch.git

FS-5636 --resolve hold active lines when receiving a call
---

diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c
index bc06b9bdb3..feac761cc3 100644
--- a/src/mod/endpoints/mod_skinny/skinny_server.c
+++ b/src/mod/endpoints/mod_skinny/skinny_server.c
@@ -700,6 +700,8 @@ switch_status_t skinny_session_answer(switch_core_session_t *session, listener_t
 	switch_assert(listener);
 	switch_assert(listener->profile);
 
+	skinny_hold_active_calls(listener);
+
 	channel = switch_core_session_get_channel(session);
 	tech_pvt = switch_core_session_get_private(session);