summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2015-04-24 08:43:52 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2015-04-24 08:44:47 +0200
commit11201def487f90fc94cc06a163c4226aebbb92e3 (patch)
treea67e192d1c65635fbc40eeb297a75714ea127266 /plugins
parenta5a5ff077106e3f5f990552fa5f953c4f478b44a (diff)
downloaduca-11201def487f90fc94cc06a163c4226aebbb92e3.tar.gz
uca-11201def487f90fc94cc06a163c4226aebbb92e3.tar.bz2
uca-11201def487f90fc94cc06a163c4226aebbb92e3.tar.xz
uca-11201def487f90fc94cc06a163c4226aebbb92e3.zip
ufo: fix async mode
pcilib_start must be called before the grab thread is started.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/ufo/uca-ufo-camera.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/ufo/uca-ufo-camera.c b/plugins/ufo/uca-ufo-camera.c
index 1de4010..0b86030 100644
--- a/plugins/ufo/uca-ufo-camera.c
+++ b/plugins/ufo/uca-ufo-camera.c
@@ -314,11 +314,11 @@ uca_ufo_camera_start_recording (UcaCamera *camera, GError **error)
set_control_bit (priv, 14, trigger_source == UCA_CAMERA_TRIGGER_SOURCE_AUTO ||
trigger_source == UCA_CAMERA_TRIGGER_SOURCE_EXTERNAL);
+ err = pcilib_start (priv->handle, PCILIB_EVENT_DATA, PCILIB_EVENT_FLAGS_DEFAULT);
+
if (transfer_async)
priv->async_thread = g_thread_create ((GThreadFunc) stream_async, camera, TRUE, error);
- err = pcilib_start (priv->handle, PCILIB_EVENT_DATA, PCILIB_EVENT_FLAGS_DEFAULT);
-
if (err != 0) {
g_set_error (&priv->construct_error,
UCA_UFO_CAMERA_ERROR, UCA_UFO_CAMERA_ERROR_INIT,