summaryrefslogtreecommitdiffstats
path: root/src/uca-camera.c
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2012-04-12 17:47:01 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2012-04-12 17:47:01 +0200
commite62d6a31e8a38a01c529a51b0582ac16373424c1 (patch)
treed794494f05720615d3fd1f166057fe781133f0b1 /src/uca-camera.c
parent8701b32d15dca588bccca5d8c0586826fbbcb09e (diff)
downloaduca-e62d6a31e8a38a01c529a51b0582ac16373424c1.tar.gz
uca-e62d6a31e8a38a01c529a51b0582ac16373424c1.tar.bz2
uca-e62d6a31e8a38a01c529a51b0582ac16373424c1.tar.xz
uca-e62d6a31e8a38a01c529a51b0582ac16373424c1.zip
Check errors and fix small issues
Diffstat (limited to 'src/uca-camera.c')
-rw-r--r--src/uca-camera.c6
1 files changed, 5 insertions, 1 deletions
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;