From 310c98755e0c8fe1d95d4e4e43b7d08c70d06353 Mon Sep 17 00:00:00 2001 From: Volker Kaiser Date: Thu, 26 Jul 2012 15:36:02 +0200 Subject: adjusted pylon additions --- src/uca-camera.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/uca-camera.c') diff --git a/src/uca-camera.c b/src/uca-camera.c index 602a3c4..78adae3 100644 --- a/src/uca-camera.c +++ b/src/uca-camera.c @@ -382,6 +382,11 @@ static UcaCamera *uca_camera_new_from_type(const gchar *type, GError **error) return UCA_CAMERA(uca_pco_camera_new(error)); #endif +#ifdef HAVE_PYLON_CAMERA + if (!g_strcmp0(type, "pylon")) + return UCA_CAMERA(uca_pylon_camera_new(error)); +#endif + #ifdef HAVE_UFO_CAMERA if (!g_strcmp0(type, "ufo")) return UCA_CAMERA(uca_ufo_camera_new(error)); @@ -425,10 +430,6 @@ UcaCamera *uca_camera_new(const gchar *type, GError **error) camera = uca_camera_new_from_type(type, &tmp_error); -#ifdef HAVE_PYLON_CAMERA - if (!g_strcmp0(type, "pylon")) - camera = UCA_CAMERA(uca_pylon_camera_new(&tmp_error)); -#endif if (tmp_error != NULL) { g_propagate_error(error, tmp_error); return NULL; -- cgit v1.2.3