summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThijs Vermeir <thijsvermeir@gmail.com>2008-01-18 10:04:25 +0000
committerThijs Vermeir <thijsvermeir@gmail.com>2008-01-18 10:04:25 +0000
commit1fc821baf2d4c4d3b609d27fee415625dfba7242 (patch)
treeb7f80834f7f31a330abf4c7f60d6993f82695ba5
parent3ded44b66db3f294cff9e73ff09cc0b026104a0e (diff)
gst/udp/gstmultiudpsink.c: Don't try to leave a multicast group with an invalid socket
Original commit message from CVS: * gst/udp/gstmultiudpsink.c: Don't try to leave a multicast group with an invalid socket
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--gst/udp/gstmultiudpsink.c3
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 748ff829..7cba0d30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-18 Thijs Vermeir <thijsvermeir@gmail.com>
+
+ * gst/udp/gstmultiudpsink.c:
+ Don't try to leave a multicast group with an invalid socket
+
2008-01-17 Tim-Philipp Müller <tim at centricular dot net>
* ext/flac/gstflacdec.c:
diff --git a/common b/common
-Subproject 0efbab89d333b5d07cc7da1a501c38edf5bb4f7
+Subproject a78a9496c0c8cd815dda3d8d6127f0a654665ab
diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c
index d36b6967..be8d4846 100644
--- a/gst/udp/gstmultiudpsink.c
+++ b/gst/udp/gstmultiudpsink.c
@@ -727,7 +727,8 @@ gst_multiudpsink_remove (GstMultiUDPSink * sink, const gchar * host, gint port)
g_get_current_time (&now);
client->disconnect_time = GST_TIMEVAL_TO_TIME (now);
- if (client->multi_addr.imr_multiaddr.s_addr && sink->auto_multicast)
+ if (*(client->sock) != -1 && client->multi_addr.imr_multiaddr.s_addr
+ && sink->auto_multicast)
leave_multicast (client);
/* Unlock to emit signal before we delete the actual client */