diff options
author | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-07 15:15:23 +0100 |
---|---|---|
committer | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-07 15:15:23 +0100 |
commit | d2de8f448a8621fb21deb915985a7d901c699731 (patch) | |
tree | 5f6f0a8b79ccf29b5d58ae8cbdf566f3de55bbde /src | |
parent | bb50e8a8b88ec5089bac3217031f1653637dc510 (diff) | |
download | uca-d2de8f448a8621fb21deb915985a7d901c699731.tar.gz uca-d2de8f448a8621fb21deb915985a7d901c699731.tar.bz2 uca-d2de8f448a8621fb21deb915985a7d901c699731.tar.xz uca-d2de8f448a8621fb21deb915985a7d901c699731.zip |
Fix grabber bug and add Gtk control application
Diffstat (limited to 'src')
-rw-r--r-- | src/grabbers/me4.c | 3 | ||||
-rw-r--r-- | src/uca.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/grabbers/me4.c b/src/grabbers/me4.c index 4cdb14a..17b46e3 100644 --- a/src/grabbers/me4.c +++ b/src/grabbers/me4.c @@ -18,7 +18,8 @@ struct uca_me4_grabber_t { uint32_t uca_me4_destroy(struct uca_grabber_t *grabber) { - Fg_FreeGrabber(GET_FG(grabber)); + if (grabber != NULL) + Fg_FreeGrabber(GET_FG(grabber)); } uint32_t uca_me4_set_property(struct uca_grabber_t *grabber, enum uca_property_ids property, void *data) @@ -98,6 +98,7 @@ struct uca_t *uca_init(void) free(uca); return NULL; } + uca->grabbers = grabber; grabber->next = NULL; /* Probe each camera that is configured */ |