Commit f4f380d3 by guof

Merge branch 'feature-1007583' into 'release'

修改实时更新远程配置新增日志01

See merge request !98
parents ff4bbac1 d521f6ee
...@@ -626,6 +626,9 @@ void MainWindow::startCamera(const QString &httpurl){ ...@@ -626,6 +626,9 @@ void MainWindow::startCamera(const QString &httpurl){
}else if(!config.nvrConfig.isOn){ }else if(!config.nvrConfig.isOn){
nvr_status = false; nvr_status = false;
} }
else if(config.nvrConfig.isOn && getDeviceStatus(hk_Device)){
nvr_status = true;
}
instace.deleteObj(res_config); instace.deleteObj(res_config);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment