summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/pbx.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 4004e1414..2dda2003d 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -8828,6 +8828,11 @@ static void context_merge(struct ast_context **extcontexts, struct ast_hashtab *
ast_hashtab_end_traversal(prio_iter);
}
ast_hashtab_end_traversal(exten_iter);
+ } else if (new) {
+ /* If the context existed but had no extensions, we still want to merge
+ * the includes, switches and ignore patterns.
+ */
+ context_merge_incls_swits_igps_other_registrars(new, context, registrar);
}
if (!insert_count && !new && (strcmp(context->registrar, registrar) != 0 ||