From 81a950ddf8e88b4bfe674f2bdd2184d1f5819561 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 6 Mar 2009 22:36:19 +0000 Subject: camerabin: Make the tests pass when the camerabin can't initialise. The camerabin tests were throwing glib errors and hanging when gst-plugins-good elements (jpegenc, videocrop) can't found. --- gst/camerabin/gstcamerabin.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gst/camerabin/gstcamerabin.c') diff --git a/gst/camerabin/gstcamerabin.c b/gst/camerabin/gstcamerabin.c index 905a8c9c..bdc4f28b 100644 --- a/gst/camerabin/gstcamerabin.c +++ b/gst/camerabin/gstcamerabin.c @@ -2750,13 +2750,15 @@ gst_camerabin_user_start (GstCameraBin * camera) } g_mutex_unlock (camera->capture_mutex); - g_object_set (G_OBJECT (camera->active_bin), "filename", - camera->filename->str, NULL); + if (camera->active_bin) { + g_object_set (G_OBJECT (camera->active_bin), "filename", + camera->filename->str, NULL); - if (camera->active_bin == camera->imgbin) { - gst_camerabin_start_image_capture (camera); - } else if (camera->active_bin == camera->vidbin) { - gst_camerabin_start_video_recording (camera); + if (camera->active_bin == camera->imgbin) { + gst_camerabin_start_image_capture (camera); + } else if (camera->active_bin == camera->vidbin) { + gst_camerabin_start_video_recording (camera); + } } } -- cgit v1.2.1