diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2015-05-13 12:39:18 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2015-05-13 12:39:18 +0200 |
| commit | a26120e69e26186454becc7658859224a4a3de2c (patch) | |
| tree | 14a6c70164745be1a8ea350474588689ee9f6461 | |
| parent | 9029cdcebd885d2e9bb1b3260c3c0f541c8743c9 (diff) | |
| download | libuca-a26120e69e26186454becc7658859224a4a3de2c.tar.gz libuca-a26120e69e26186454becc7658859224a4a3de2c.tar.bz2 libuca-a26120e69e26186454becc7658859224a4a3de2c.tar.xz libuca-a26120e69e26186454becc7658859224a4a3de2c.zip | |
Fix wrong place of write check caused by 453701edd
| -rw-r--r-- | plugins/file/uca-file-camera.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/file/uca-file-camera.c b/plugins/file/uca-file-camera.c index 26a590d..e450b34 100644 --- a/plugins/file/uca-file-camera.c +++ b/plugins/file/uca-file-camera.c @@ -205,6 +205,12 @@ uca_file_camera_set_property (GObject *object, guint property_id, const GValue * g_return_if_fail(UCA_IS_FILE_CAMERA(object)); UcaFileCameraPrivate *priv = UCA_FILE_CAMERA_GET_PRIVATE(object); + 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_PATH: g_free (priv->path); @@ -227,11 +233,6 @@ uca_file_camera_get_property(GObject *object, guint property_id, GValue *value, g_return_if_fail (UCA_IS_FILE_CAMERA (object)); UcaFileCameraPrivate *priv = UCA_FILE_CAMERA_GET_PRIVATE (object); - 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_NAME: g_value_set_string (value, "file camera"); |