summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2016-07-13 12:28:01 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2016-07-13 12:28:30 +0200
commitef9222d2095898d6929c17250a57eaf0f9113a8d (patch)
treec79d090386ba7ebd5016cc810701bd5b2ac2f8cc
parentc09eaa3be331f1746744ef2562360528a8358dd1 (diff)
downloaduca-ufo-ef9222d2095898d6929c17250a57eaf0f9113a8d.tar.gz
uca-ufo-ef9222d2095898d6929c17250a57eaf0f9113a8d.tar.bz2
uca-ufo-ef9222d2095898d6929c17250a57eaf0f9113a8d.tar.xz
uca-ufo-ef9222d2095898d6929c17250a57eaf0f9113a8d.zip
Return TIMEOUT error if ETIME is returned
-rw-r--r--uca-ufo-camera.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/uca-ufo-camera.c b/uca-ufo-camera.c
index 7fb6781..a739e07 100644
--- a/uca-ufo-camera.c
+++ b/uca-ufo-camera.c
@@ -418,7 +418,7 @@ uca_ufo_camera_grab(UcaCamera *camera, gpointer data, GError **error)
set_control_bit (priv, 2, FALSE);
}
- PCILIB_SET_ERROR_RETURN_FALSE (err, UCA_UFO_CAMERA_ERROR_NEXT_EVENT);
+ PCILIB_SET_ERROR_RETURN_FALSE (err, err == ETIME ? UCA_CAMERA_ERROR_TIMEOUT : UCA_UFO_CAMERA_ERROR_NEXT_EVENT);
gpointer src = pcilib_get_data (priv->handle, event_id, PCILIB_EVENT_DATA, (size_t *) &err);