[cheese/gnome-2-28] Avoid warnings on exit when playback hasn't started
- From: Bastien Nocera <hadess src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [cheese/gnome-2-28] Avoid warnings on exit when playback hasn't started
- Date: Mon, 30 Nov 2009 18:56:26 +0000 (UTC)
commit 9edf0ca161cba7a6f8c33f3a202a028c7ba86815
Author: Bastien Nocera <hadess hadess net>
Date: Fri Nov 27 17:20:51 2009 +0000
Avoid warnings on exit when playback hasn't started
When exiting cheese before the GStreamer pipeline is ready,
avoid warnings trying to unref non-existant GStreamer pipelines.
https://bugzilla.gnome.org/show_bug.cgi?id=603167
src/cheese-webcam.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/cheese-webcam.c b/src/cheese-webcam.c
index b0f4530..66d9fca 100644
--- a/src/cheese-webcam.c
+++ b/src/cheese-webcam.c
@@ -1285,7 +1285,8 @@ cheese_webcam_stop (CheeseWebcam *webcam)
{
CheeseWebcamPrivate *priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
- gst_element_set_state (priv->pipeline, GST_STATE_NULL);
+ if (priv->pipeline != NULL)
+ gst_element_set_state (priv->pipeline, GST_STATE_NULL);
priv->pipeline_is_playing = FALSE;
}
@@ -1444,11 +1445,12 @@ cheese_webcam_finalize (GObject *object)
CheeseWebcamPrivate *priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
cheese_webcam_stop (webcam);
- gst_object_unref (priv->pipeline);
+ if (priv->pipeline != NULL)
+ gst_object_unref (priv->pipeline);
- if (priv->is_recording)
+ if (priv->is_recording && priv->photo_save_bin != NULL)
gst_object_unref (priv->photo_save_bin);
- else
+ else if (priv->video_save_bin != NULL)
gst_object_unref (priv->video_save_bin);
g_free (priv->photo_filename);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]