From 105a9eab72acf4d61613f5e7fb0c064dd54c4a25 Mon Sep 17 00:00:00 2001
From: Nanang Izzuddin <nanang@teluu.com>
Date: Tue, 17 Dec 2013 09:01:21 +0000
Subject: Fixed #1717: Destroy media subsystem after all pollings/busy_sleep()
 are done, but leave deallocating media transport (via
 pjsua_media_channel_deinit()) before the pollings to allow clean TURN
 destroy.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4694 74dad513-b988-da41-8d7b-12977e46ad98
---
 pjsip/src/pjsua-lib/pjsua_media.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'pjsip/src/pjsua-lib/pjsua_media.c')

diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c
index acaa0e1f..ce7722c9 100644
--- a/pjsip/src/pjsua-lib/pjsua_media.c
+++ b/pjsip/src/pjsua-lib/pjsua_media.c
@@ -179,7 +179,7 @@ pj_status_t pjsua_media_subsys_start(void)
  */
 pj_status_t pjsua_media_subsys_destroy(unsigned flags)
 {
-    unsigned i;
+    PJ_UNUSED_ARG(flags);
 
     PJ_LOG(4,(THIS_FILE, "Shutting down media.."));
     pj_log_push_indent();
@@ -191,6 +191,8 @@ pj_status_t pjsua_media_subsys_destroy(unsigned flags)
 	pjsua_aud_subsys_destroy();
     }
 
+#if 0
+    // This part has been moved out to pjsua_destroy() (see also #1717).
     /* Close media transports */
     for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) {
         /* TODO: check if we're not allowed to send to network in the
@@ -199,6 +201,7 @@ pj_status_t pjsua_media_subsys_destroy(unsigned flags)
 	PJ_UNUSED_ARG(flags);
 	pjsua_media_channel_deinit(i);
     }
+#endif
 
     /* Destroy media endpoint. */
     if (pjsua_var.med_endpt) {
-- 
cgit v1.2.3