From d2de8f448a8621fb21deb915985a7d901c699731 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Mon, 7 Mar 2011 15:15:23 +0100 Subject: Fix grabber bug and add Gtk control application --- src/grabbers/me4.c | 3 ++- src/uca.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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) diff --git a/src/uca.c b/src/uca.c index b70c25a..7cbe8b8 100644 --- a/src/uca.c +++ b/src/uca.c @@ -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 */ -- cgit v1.2.3