diff options
author | Yoann Lopes <yoann.lopes@qt.io> | 2016-08-01 11:52:05 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-08-01 11:52:05 +0200 |
commit | 339944b284e9dd11302dd013f9d9a10ad0d9055a (patch) | |
tree | c2952d186b1dbc6f2380448fa2cfd9ec55043da6 /src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp | |
parent | 53d0a1e5454f4e5beecdea19acb9df11c87cc375 (diff) | |
parent | d7d31d63db5f0029a4a5e24d998601baee8bade0 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ic29cb09048003f18ff86d4546cd547be715eaec8
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp b/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp index d2be15e71..6ca1dbe94 100644 --- a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp @@ -200,8 +200,10 @@ void CameraBinV4LImageProcessing::setParameter( const QCameraImageProcessing::WhiteBalanceMode m = value.value<QCameraImageProcessing::WhiteBalanceMode>(); if (m != QCameraImageProcessing::WhiteBalanceAuto - && m != QCameraImageProcessing::WhiteBalanceManual) + && m != QCameraImageProcessing::WhiteBalanceManual) { + qt_safe_close(fd); return; + } control.value = (m == QCameraImageProcessing::WhiteBalanceAuto) ? true : false; } @@ -220,6 +222,7 @@ void CameraBinV4LImageProcessing::setParameter( break; default: + qt_safe_close(fd); return; } |