summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-02-02 10:19:38 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-02-02 10:19:38 +0000
commit51345d50dff11d6fac850e399690235719676021 (patch)
tree606623195cb9830e4d2ec9100d77ca0d9d28e626
parent119c42f201c5870562809a99d9a8f1c5679ad61a (diff)
downloadgstreamer-plugins-bad-51345d50dff11d6fac850e399690235719676021.tar.gz
check for NULLness and warn if we can't report GError
Original commit message from CVS: check for NULLness and warn if we can't report GError
-rw-r--r--ChangeLog5
-rw-r--r--gst-libs/gst/play/play.c15
2 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ec86a2c81..a53c5de24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-02 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * gst-libs/gst/play/play.c: (gst_play_new):
+ check for GError
+
2004-02-01 Julien MOUTTE <julien@moutte.net>
* gst-libs/gst/play/play.c: (gst_play_seek_to_time),
diff --git a/gst-libs/gst/play/play.c b/gst-libs/gst/play/play.c
index ba100fb3d..46738fd16 100644
--- a/gst-libs/gst/play/play.c
+++ b/gst-libs/gst/play/play.c
@@ -1133,12 +1133,19 @@ gst_play_new (GError **error)
{
GstPlay *play = g_object_new (GST_TYPE_PLAY, NULL);
- if ( (error) && (play->priv->error) )
+ if (play->priv->error)
{
- *error = play->priv->error;
- play->priv->error = NULL;
+ if (error)
+ {
+ *error = play->priv->error;
+ play->priv->error = NULL;
+ }
+ else
+ {
+ g_warning ("Error creating GstPlay object.\n%s", play->priv->error->message);
+ g_error_free (play->priv->error);
+ }
}
-
return play;
}