From 87521ead3438b56b795d9836ae95f1709328caa4 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 13 Jul 2020 09:24:41 -0400 Subject: [PATCH] TT#85701 fix regression from 8e22c9a41 Make sure we delete all branched B side monologues when deleting the A side monologue. Change-Id: If7214443a9d3e76a05c0b1f526eb2d9091aee822 --- daemon/call.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/daemon/call.c b/daemon/call.c index a68716090..d4b7e65b2 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -2772,11 +2772,17 @@ static void __monologue_destroy(struct call_monologue *monologue, int recurse) { if (dialogue == monologue) continue; if (monologue->tag.len + && dialogue->tag.len && !g_hash_table_lookup(dialogue->other_tags, &monologue->tag)) continue; if (monologue->viabranch.len + && !monologue->tag.len && !g_hash_table_lookup(dialogue->branches, &monologue->viabranch)) continue; + if (!dialogue->tag.len + && dialogue->viabranch.len + && !g_hash_table_lookup(monologue->branches, &dialogue->viabranch)) + continue; g_hash_table_remove(dialogue->other_tags, &monologue->tag); g_hash_table_remove(dialogue->branches, &monologue->viabranch);