Merge branch 'release-9.10' into release-10.0

wireapp · Jan 13, 2025 · d6015b1 · d6015b1
2 parents f520840 + 8319805
commit d6015b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/ccall/ccall.c b/src/ccall/ccall.c
@@ -3835,7 +3835,7 @@ static void ccall_end_with_err(struct ccall *ccall, int err)
 	}
 
 	userlist_incall_clear(ccall->userl, false, false);
-	if (ccall->ecall)
+	if (ccall->ecall && ecall_get_econn(ccall->ecall))
 		ecall_end(ccall->ecall);
 	else
 		set_state(ccall, CCALL_STATE_IDLE);

diff --git a/src/ecall/ecall.c b/src/ecall/ecall.c
@@ -2438,7 +2438,7 @@ void ecall_end(struct ecall *ecall)
 	if (!ecall)
 		return;
 
-	info("ecall(%p): [self=%s] end\n", ecall, anon_id(userid_anon, ecall->userid_self));
+	info("ecall(%p): [self=%s] econn: %p end\n", ecall, anon_id(userid_anon, ecall->userid_self), ecall->econn);
 
 	/* disconnect all connections */
 	econn_end(ecall->econn);