Merge branch 'feature-1007488' into 'release'

新增gb28181日志05

See merge request !52

mainwindow.cpp

@@ -499,7 +499,8 @@ void MainWindow::setIsResetting(bool running) {
 //平台没有 盒子有 盒子关闭
 void MainWindow::startCamera(const QString &httpurl){
     if(this->isResetting.load(std::memory_order_acquire)){
-        qInfo()<<"正在执行复位GB28181 程序,请等待";        
+        qInfo()<<"正在执行复位GB28181 程序,请等待";
+        return;
     }
     Common & instace= Common::getInstance();
     MediaFaceImage* mediaFaceImage= MediaFaceImage::getInstance();