From 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 22:24:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/DataManagerServer/AppPipeController.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
index a8cf2f7..8d00d0e 100644
--- a/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
+++ b/QiaoJiaSystem/DataManagerServer/AppPipeController.cpp
@@ -15,7 +15,7 @@
}
videoCaptureElement.registerConnector([&]{
//if(!videoPublishElement.isBusy()){
- //videoPublishElement.setImage(videoCaptureElement.getImage());
+ videoPublishElement.setImage(videoCaptureElement.getImage());
//videoPublishElement.submit();
//}
--
Gitblit v1.8.0