[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  2b55882009f8a821bfacd0b40ede6cffce324881 (commit)
       via  f272e9fd3e8e44142b1aeea595ca75bea9d20473 (commit)
      from  db071ec80ad9e9901ad7c548d475edbf70f70667 (commit)

Summary of changes:
 src/MediaRTPpjmedia.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 2b55882009f8a821bfacd0b40ede6cffce324881
Merge: f272e9f db071ec
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 30 10:50:01 2010 -0300

    Merge branch 'master' of git.asterisk.org:asterisk-scf/integration/media_rtp_pjmedia


commit f272e9fd3e8e44142b1aeea595ca75bea9d20473
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 30 10:49:33 2010 -0300

    Only remove a pjthread if the thread has been added.

diff --git a/src/MediaRTPpjmedia.cpp b/src/MediaRTPpjmedia.cpp
index e235de6..d8d1960 100644
--- a/src/MediaRTPpjmedia.cpp
+++ b/src/MediaRTPpjmedia.cpp
@@ -163,7 +163,10 @@ public:
 	 */
 	void stop()
 	{
-		pjThreads.erase(pj_thread_this());
+		if (pj_thread_is_registered())
+		{
+			pjThreads.erase(pj_thread_this());
+		}
 	}
 private:
 	/**

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/media_rtp_pjmedia.git