mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-02-06 13:01:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/Motion-Project/master'

Browse Source
This commit is contained in:
Radek Hvizdos
2017-01-31 16:04:34 +01:00
parent 0e4663ae7e dba8ad1a65
commit 0fcb9c63e7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webhttpd.c
View File

@@ -1214,7 +1214,9 @@ static unsigned int detection(char *pointer, char *res, unsigned int length_uri,
send_template_end_client(client_socket);
} else {
send_template_ini_client_raw(client_socket);
sprintf(res, "Camera %d Detection resumed\nDone\n", cnt[thread]->conf.camera_id);
sprintf(res, "Camera %d%s%s Detection resumed\nDone\n", cnt[thread]->conf.camera_id,
cnt[thread]->conf.camera_name ? " -- " : "",
cnt[thread]->conf.camera_name ? cnt[thread]->conf.camera_name : "");
send_template_raw(client_socket, res);
}
} else {
@@ -1248,7 +1250,7 @@ static unsigned int detection(char *pointer, char *res, unsigned int length_uri,
send_template_end_client(client_socket);
} else {
send_template_ini_client_raw(client_socket);
sprintf(res, "<b>Camera %d%s%s</b> Detection paused\nDone\n", cnt[thread]->conf.camera_id,
sprintf(res, "Camera %d%s%s Detection paused\nDone\n", cnt[thread]->conf.camera_id,
cnt[thread]->conf.camera_name ? " -- " : "",
cnt[thread]->conf.camera_name ? cnt[thread]->conf.camera_name : "");
send_template_raw(client_socket, res);