diff --git a/main/bridge.c b/main/bridge.c index 4798c72708..23f682ccea 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -5126,6 +5126,7 @@ static char *handle_bridge_show_specific(struct ast_cli_entry *e, int cmd, struc ast_cli(a->fd, "Subclass: %s\n", snapshot->subclass); ast_cli(a->fd, "Creator: %s\n", snapshot->creator); ast_cli(a->fd, "Name: %s\n", snapshot->name); + ast_cli(a->fd, "Video-Mode: %s\n", ast_bridge_video_mode_to_string(snapshot->video_mode)); ast_cli(a->fd, "Video-Source-Id: %s\n", snapshot->video_source_id); ast_cli(a->fd, "Num-Channels: %u\n", snapshot->num_channels); ast_cli(a->fd, "Num-Active: %u\n", snapshot->num_active); diff --git a/res/res_stasis.c b/res/res_stasis.c index 85596589c8..4850f6af2f 100644 --- a/res/res_stasis.c +++ b/res/res_stasis.c @@ -799,12 +799,12 @@ struct ast_bridge *stasis_app_bridge_create(const char *type, const char *name, bridge = bridge_stasis_new(capabilities, flags, name, id); if (bridge) { - ast_bridge_set_talker_src_video_mode(bridge); if (!ao2_link(app_bridges, bridge)) { ast_bridge_destroy(bridge, 0); bridge = NULL; } } + return bridge; } diff --git a/res/stasis/stasis_bridge.c b/res/stasis/stasis_bridge.c index 701cbaea82..1b87b48a45 100644 --- a/res/stasis/stasis_bridge.c +++ b/res/stasis/stasis_bridge.c @@ -305,6 +305,11 @@ struct ast_bridge *bridge_stasis_new(uint32_t capabilities, unsigned int flags, bridge = bridge_alloc(sizeof(struct ast_bridge), &bridge_stasis_v_table); bridge = bridge_base_init(bridge, capabilities, flags, "Stasis", name, id); + if (!bridge) { + return NULL; + } + + ast_bridge_set_talker_src_video_mode(bridge); bridge = bridge_register(bridge); return bridge;