[Pkg-voip-commits] [janus] 109/282: Move iceloop running check from janus_ice_webrtc_free to janus_ice_handles_check.
Jonas Smedegaard
dr at jones.dk
Wed Dec 20 21:53:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag debian/0.2.6-1
in repository janus.
commit 207e13c6b8024b455832f0cbefb7ddc52b6c97ed
Author: Alessandro Toppi <atoppi at meetecho.com>
Date: Wed Sep 27 11:08:11 2017 +0200
Move iceloop running check from janus_ice_webrtc_free to janus_ice_handles_check.
---
ice.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ice.c b/ice.c
index a6802f1..264e05b 100644
--- a/ice.c
+++ b/ice.c
@@ -444,6 +444,9 @@ static gboolean janus_ice_handles_check(gpointer user_data) {
if (!handle) {
continue;
}
+ if(g_main_loop_is_running(handle->iceloop)) {
+ continue;
+ }
/* Schedule the ICE handle for deletion */
g_hash_table_iter_remove(&iter);
GSource *timeout_source = g_timeout_source_new_seconds(3);
@@ -1244,9 +1247,6 @@ void janus_ice_webrtc_free(janus_ice_handle *handle) {
janus_mutex_lock(&handle->mutex);
janus_flags_clear(&handle->webrtc_flags, JANUS_ICE_HANDLE_WEBRTC_READY);
if(handle->iceloop != NULL) {
- if(g_main_loop_is_running(handle->iceloop)) {
- g_main_loop_quit(handle->iceloop);
- }
g_main_loop_unref (handle->iceloop);
handle->iceloop = NULL;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git
More information about the Pkg-voip-commits
mailing list