diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2016-10-07 15:49:06 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2016-10-07 15:49:06 +0200 |
| commit | 71e1f2db8b87763c06211d85119a921b11095a9d (patch) | |
| tree | 27e4bc964ef5d1e73ea52f1fb253fc1875cecc86 | |
| parent | 96483d87e26b9333e03e4091d3aa77fd53e8f9e6 (diff) | |
| parent | ef9222d2095898d6929c17250a57eaf0f9113a8d (diff) | |
| download | uca-ufo-71e1f2db8b87763c06211d85119a921b11095a9d.tar.gz uca-ufo-71e1f2db8b87763c06211d85119a921b11095a9d.tar.bz2 uca-ufo-71e1f2db8b87763c06211d85119a921b11095a9d.tar.xz uca-ufo-71e1f2db8b87763c06211d85119a921b11095a9d.zip | |
Merge branch 'master' of https://github.com/ufo-kit/uca-ufo
| -rw-r--r-- | uca-ufo-camera.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/uca-ufo-camera.c b/uca-ufo-camera.c index 149220c..7470418 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); |