mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-06-11 15:24:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adjust restart action

Browse Source
This commit is contained in:
MrDave
2021-06-18 17:57:49 -06:00
committed by Mr-Dave
parent e0bd4dac2e
commit 2e66bcd779
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/motion_loop.cpp
View File

@@ -679,7 +679,7 @@ static void mlp_init_ref(struct ctx_cam *cam)
/** mlp_init */
static int mlp_init(struct ctx_cam *cam)
{
MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO,_("initialize."));
MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("initialize loop"));
mythreadname_set("ml",cam->threadnr,cam->conf->camera_name.c_str());
@@ -1647,6 +1647,7 @@ void *motion_loop(void *arg)
struct ctx_cam *cam =(struct ctx_cam *) arg;
cam->running_cam = true;
cam->finish_cam = false;
pthread_mutex_lock(&cam->motapp->global_lock);
cam->motapp->threads_running++;
@@ -1655,7 +1656,7 @@ void *motion_loop(void *arg)
cam->watchdog = cam->conf->watchdog_tmo;
if (mlp_init(cam) == 0) {
while (!cam->finish_cam || cam->event_stop) {
while (cam->finish_cam == false) {
mlp_prepare(cam);
if (cam->get_image) {
mlp_resetimages(cam);
@@ -1689,6 +1690,7 @@ void *motion_loop(void *arg)
pthread_mutex_unlock(&cam->motapp->global_lock);
cam->running_cam = false;
cam->finish_cam = true;
pthread_exit(NULL);
}

7
src/webu_post.cpp
View File

@@ -242,10 +242,7 @@ void webu_post_action_restart(struct ctx_webui *webui)
indx = 1;
while (webui->motapp->cam_list[indx]) {
webui->motapp->cam_list[indx]->restart_cam = true;
if (webui->motapp->cam_list[indx]->running_cam) {
webui->motapp->cam_list[indx]->event_stop = true;
webui->motapp->cam_list[indx]->finish_cam = true;
}
webui->motapp->cam_list[indx]->finish_cam = true;
indx++;
}
} else {
@@ -253,7 +250,7 @@ void webu_post_action_restart(struct ctx_webui *webui)
, _("Restarting camera %d")
, webui->motapp->cam_list[webui->threadnbr]->camera_id);
webui->motapp->cam_list[webui->threadnbr]->restart_cam = true;
webui->motapp->cam_list[webui->threadnbr]->finish_cam = false;
webui->motapp->cam_list[webui->threadnbr]->finish_cam = true;
}
}