From c24b03d43977b75db84e03bfcdbe3a7b1ae2c1ea Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 07 三月 2019 11:30:00 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/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