Merge branch 'multi-trig' into 'dev'
Corrected var check for multi trigger setting. Initial check had the incorrect variable (`detector_multi_trigger`) for checking the monitor settings. Monitor settings and all other references use `det_multi_trig` This change fixes the check to look for `det_multi_trig` now. See merge request Shinobi-Systems/Shinobi!116pushover
commit
24ba7ed7fa
|
|
@ -237,7 +237,7 @@ module.exports = function(s,config,lang){
|
|||
frame : s.group[d.ke].activeMonitors[d.id].lastJpegDetectorFrame
|
||||
})
|
||||
}else{
|
||||
if(currentConfig.detector_multi_trigger === '1'){
|
||||
if(currentConfig.det_multi_trig === '1'){
|
||||
s.getCamerasForMultiTrigger(d.mon).forEach(function(monitor){
|
||||
if(monitor.mid !== d.id){
|
||||
s.triggerEvent({
|
||||
|
|
|
|||
Loading…
Reference in New Issue