[gtk] mediastream: Allow multiple calls to gtk_media_stream_error()
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] mediastream: Allow multiple calls to gtk_media_stream_error()
- Date: Tue, 18 Dec 2018 01:06:31 +0000 (UTC)
commit 89c48a08a0fe333644b3a888e465d34fd3a8af99
Author: Benjamin Otte <otte redhat com>
Date: Tue Dec 18 02:04:16 2018 +0100
mediastream: Allow multiple calls to gtk_media_stream_error()
Just ignore all further ones.
gtk/gtkmediastream.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/gtk/gtkmediastream.c b/gtk/gtkmediastream.c
index 86f5c72cc5..f8a5dc8ce9 100644
--- a/gtk/gtkmediastream.c
+++ b/gtk/gtkmediastream.c
@@ -1120,6 +1120,10 @@ gtk_media_stream_unprepared (GtkMediaStream *self)
* your GtkMediaStream.pause() implementation), abort pending seeks
* and mark the stream as prepared.
*
+ * if the stream is already in an error state, this call will be ignored
+ * and the existing error will be retained.
+ * FIXME: Or do we want to set the new error?
+ *
* To unset an error, the stream must be reset via a call to
* gtk_media_stream_unprepared().
**/
@@ -1130,9 +1134,11 @@ gtk_media_stream_gerror (GtkMediaStream *self,
GtkMediaStreamPrivate *priv = gtk_media_stream_get_instance_private (self);
g_return_if_fail (GTK_IS_MEDIA_STREAM (self));
- g_return_if_fail (gtk_media_stream_get_error (self) == NULL);
g_return_if_fail (error != NULL);
+ if (priv->error)
+ return;
+
g_object_freeze_notify (G_OBJECT (self));
priv->error = error;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]