summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/app_minivm.c8
-rw-r--r--apps/app_queue.c8
2 files changed, 7 insertions, 9 deletions
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index fb7c22aa4..789a48aab 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -1853,10 +1853,10 @@ static int notify_new_message(struct ast_channel *chan, const char *templatename
}
mwi_state->snapshot = ast_channel_snapshot_get_latest(ast_channel_uniqueid(chan));
- json_object = ast_json_pack("{s: s, s: s}",
- "Event", "MiniVoiceMail"
- "Action", "SentNotification",
- "Counter", counter);
+ json_object = ast_json_pack("{s: s, s: s, s: s}",
+ "Event", "MiniVoiceMail",
+ "Action", "SentNotification",
+ "Counter", counter ?: "");
if (!json_object) {
goto notify_cleanup;
}
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 45b5683ed..79a19c8f6 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -7199,12 +7199,10 @@ static void set_queue_member_pause(struct call_queue *q, struct member *mem, con
}
mem->paused = paused;
- if (paused) {
- if (!ast_strlen_zero(reason)) {
- ast_copy_string(mem->reason_paused, reason, sizeof(mem->reason_paused));
- }
+ if (paused && !ast_strlen_zero(reason)) {
+ ast_copy_string(mem->reason_paused, reason, sizeof(mem->reason_paused));
} else {
- ast_copy_string(mem->reason_paused, "", sizeof(mem->reason_paused));
+ mem->reason_paused[0] = '\0';
}
ast_devstate_changed(mem->paused ? QUEUE_PAUSED_DEVSTATE : QUEUE_UNPAUSED_DEVSTATE,