summaryrefslogtreecommitdiffstats
path: root/plugins/pylon
diff options
context:
space:
mode:
authorTimo Dritschler <timo.dritschler@kit.edu>2015-03-02 15:57:23 +0100
committerTimo Dritschler <timo.dritschler@kit.edu>2015-03-09 11:12:26 +0100
commit453701eddba38052a466e91d614fd999b52bca4a (patch)
tree2b0c346ab845f1b47f8d18aad675411cedef4673 /plugins/pylon
parent43a5d42eeaccb08b7703e01e326e397ed3cd4ac2 (diff)
downloaduca-453701eddba38052a466e91d614fd999b52bca4a.tar.gz
uca-453701eddba38052a466e91d614fd999b52bca4a.tar.bz2
uca-453701eddba38052a466e91d614fd999b52bca4a.tar.xz
uca-453701eddba38052a466e91d614fd999b52bca4a.zip
Added check for 'writable during acquisition' to all set_property calls
Diffstat (limited to 'plugins/pylon')
-rw-r--r--plugins/pylon/uca-pylon-camera.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/pylon/uca-pylon-camera.c b/plugins/pylon/uca-pylon-camera.c
index 4420d58..af6b8cf 100644
--- a/plugins/pylon/uca-pylon-camera.c
+++ b/plugins/pylon/uca-pylon-camera.c
@@ -135,9 +135,15 @@ static gboolean uca_pylon_camera_grab(UcaCamera *camera, gpointer data, GError *
static void uca_pylon_camera_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
{
- UcaPylonCameraPrivate *priv = UCA_PYLON_CAMERA_GET_PRIVATE(object);
+ g_return_if_fail (UCA_IS_PYLON_CAMERA (object));
+ UcaPylonCameraPrivate *priv = UCA_PYLON_CAMERA_GET_PRIVATE (object);
GError* error = NULL;
+ if (uca_camera_is_recording (UCA_CAMERA (object)) && !uca_camera_is_writable_during_acquisition (UCA_CAMERA (object), pspec->name)) {
+ g_warning ("Property '%s' cant be changed during acquisition", pspec->name);
+ return;
+ }
+
switch (property_id) {
case PROP_SENSOR_HORIZONTAL_BINNING:
/* intentional fall-through*/