rhythmbox r6104 - in trunk: . plugins/daap

[jmatthew svn gnome org]

Author: jmatthew
Date: Thu Dec 18 02:27:16 2008
New Revision: 6104
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6104&view=rev

Log:
2008-12-18  Jonathan Matthew  <jonathan d14n org>

	* plugins/daap/rb-daap-mdns-avahi.c:
	(rb_daap_mdns_avahi_set_entry_group):
	Fix some assertions, should stop it crashing on shutdown.
	Probably fixes #562188.


Modified:
   trunk/ChangeLog
   trunk/plugins/daap/rb-daap-mdns-avahi.c

Modified: trunk/plugins/daap/rb-daap-mdns-avahi.c
==============================================================================
--- trunk/plugins/daap/rb-daap-mdns-avahi.c	(original)
+++ trunk/plugins/daap/rb-daap-mdns-avahi.c	Thu Dec 18 02:27:16 2008
@@ -114,7 +114,9 @@
 void
 rb_daap_mdns_avahi_set_entry_group (AvahiEntryGroup *eg)
 {
-	g_assert (eg == NULL || entry_group == NULL);
-	g_assert (avahi_entry_group_get_client (eg) == client);
+	if (eg != NULL) {
+		g_assert (entry_group == NULL);
+		g_assert (avahi_entry_group_get_client (eg) == client);
+	}
 	entry_group = eg;
 }