summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2013-09-17 13:50:55 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2013-09-17 13:58:11 +0200
commit37c98654a41be1ec90c9e6e399baae1583476060 (patch)
tree03920da754683b1298e02f2cf1c6b6999a86af45
parentcb2e0b7a6318b5b8cad15f5a31d474448814797c (diff)
downloaduca-37c98654a41be1ec90c9e6e399baae1583476060.tar.gz
uca-37c98654a41be1ec90c9e6e399baae1583476060.tar.bz2
uca-37c98654a41be1ec90c9e6e399baae1583476060.tar.xz
uca-37c98654a41be1ec90c9e6e399baae1583476060.zip
Do not throw an error when stream is finished
-rw-r--r--plugins/pco/uca-pco-camera.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/plugins/pco/uca-pco-camera.c b/plugins/pco/uca-pco-camera.c
index b327532..8a58f06 100644
--- a/plugins/pco/uca-pco-camera.c
+++ b/plugins/pco/uca-pco-camera.c
@@ -606,11 +606,8 @@ uca_pco_camera_grab(UcaCamera *camera, gpointer data, GError **error)
g_object_get(G_OBJECT(camera), "is-readout", &is_readout, NULL);
if (is_readout) {
- if (priv->current_image == priv->num_recorded_images) {
- g_set_error (error, UCA_CAMERA_ERROR, UCA_CAMERA_ERROR_END_OF_STREAM,
- "End of data stream");
+ if (priv->current_image == priv->num_recorded_images)
return FALSE;
- }
/*
* No joke, the pco firmware allows to read a range of images but