[Pkg-voip-commits] [janus] 248/282: Add some extra iceloop checks.

Jonas Smedegaard dr at jones.dk
Wed Dec 20 21:53:46 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 43987ebf3603e7f8126f1417769f8cc32fd68364
Author: Alessandro Toppi <atoppi at meetecho.com>
Date:   Mon Dec 4 18:09:20 2017 +0100

    Add some extra iceloop checks.
---
 ice.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ice.c b/ice.c
index f7620f0..42c69cd 100644
--- a/ice.c
+++ b/ice.c
@@ -1133,7 +1133,7 @@ gint janus_ice_handle_destroy(void *gateway_session, guint64 handle_id) {
 			if(handle->data_id > 0) {
 				nice_agent_attach_recv(handle->agent, handle->data_id, 1, g_main_loop_get_context (handle->iceloop), NULL, NULL);
 			}
-			if(g_main_loop_is_running(handle->iceloop)) {
+			if(handle->iceloop != NULL && g_main_loop_is_running(handle->iceloop)) {
 				g_main_loop_quit(handle->iceloop);
 			}
 		}
@@ -1165,7 +1165,7 @@ gint janus_ice_handle_destroy(void *gateway_session, guint64 handle_id) {
 		if(handle->data_id > 0) {
 			nice_agent_attach_recv(handle->agent, handle->data_id, 1, g_main_loop_get_context (handle->iceloop), NULL, NULL);
 		}
-		if(g_main_loop_is_running(handle->iceloop)) {
+		if(handle->iceloop != NULL && g_main_loop_is_running(handle->iceloop)) {
 			g_main_loop_quit(handle->iceloop);
 		}
 	}
@@ -1271,7 +1271,7 @@ void janus_ice_webrtc_hangup(janus_ice_handle *handle, const char *reason) {
 					break;
 				}
 			}
-			if(g_main_loop_is_running(handle->iceloop)) {
+			if(handle->iceloop != NULL && g_main_loop_is_running(handle->iceloop)) {
 				JANUS_LOG(LOG_VERB, "[%"SCNu64"] Forcing ICE loop to quit (%s)\n", handle->handle_id, g_main_loop_is_running(handle->iceloop) ? "running" : "NOT running");
 				g_main_loop_quit(handle->iceloop);
 				if (handle->icectx != 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