diff options
| -rw-r--r-- | src/cameras/uca-pco-camera.c | 6 | ||||
| -rw-r--r-- | src/uca-camera.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/cameras/uca-pco-camera.c b/src/cameras/uca-pco-camera.c index fa97fb6..945155a 100644 --- a/src/cameras/uca-pco-camera.c +++ b/src/cameras/uca-pco-camera.c @@ -333,9 +333,11 @@ static void uca_pco_camera_stop_recording(UcaCamera *camera, GError **error) { g_return_if_fail(UCA_IS_PCO_CAMERA(camera)); UcaPcoCameraPrivate *priv = UCA_PCO_CAMERA_GET_PRIVATE(camera); - pco_stop_recording(priv->pco); - guint err = Fg_stopAcquireEx(priv->fg, priv->fg_port, priv->fg_mem, STOP_SYNC); + guint err = pco_stop_recording(priv->pco); + HANDLE_PCO_ERROR(err); + + err = Fg_stopAcquireEx(priv->fg, priv->fg_port, priv->fg_mem, STOP_SYNC); FG_SET_ERROR(err, priv->fg, UCA_PCO_CAMERA_ERROR_FG_ACQUISITION); } diff --git a/src/uca-camera.c b/src/uca-camera.c index 628edec..563f736 100644 --- a/src/uca-camera.c +++ b/src/uca-camera.c @@ -117,6 +117,10 @@ static void uca_camera_get_property(GObject *object, guint property_id, GValue * g_value_set_boolean(value, priv->is_recording); break; + case PROP_IS_READOUT: + g_value_set_boolean(value, priv->is_readout); + break; + case PROP_TRANSFER_ASYNCHRONOUSLY: g_value_set_boolean(value, priv->transfer_async); break; @@ -499,7 +503,7 @@ void uca_camera_grab(UcaCamera *camera, gpointer *data, GError **error) g_return_if_fail(klass->grab != NULL); g_return_if_fail(data != NULL); - if (!camera->priv->is_recording || !camera->priv->is_readout) { + if (!camera->priv->is_recording && !camera->priv->is_readout) { g_set_error(error, UCA_CAMERA_ERROR, UCA_CAMERA_ERROR_NOT_RECORDING, "Camera is neither recording nor in readout mode"); return; |