From 6f27f088e5d9e828bdce65ab85984d2084bab222 Mon Sep 17 00:00:00 2001 From: pansen <pansen626@sina.com> Date: 星期三, 06 三月 2019 11:52:47 +0800 Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2 --- 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