gnome-panel r11458 - trunk/gnome-panel

[vuntz svn gnome org]

Author: vuntz
Date: Tue Jan 20 13:50:22 2009
New Revision: 11458
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11458&view=rev

Log:
2009-01-20  Vincent Untz  <vuntz gnome org>

	* applet.c: (panel_applet_stop_loading): the assertion there was wrong,
	and caused a crash when reloading an applet that crashed.


Modified:
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/applet.c

Modified: trunk/gnome-panel/applet.c
==============================================================================
--- trunk/gnome-panel/applet.c	(original)
+++ trunk/gnome-panel/applet.c	Tue Jan 20 13:50:22 2009
@@ -847,10 +847,12 @@
 			break;
 	}
 
-	g_assert (l != NULL);
-
-	panel_applets_loading = g_slist_delete_link (panel_applets_loading, l);
-	free_applet_to_load (applet);
+	/* this can happen if we reload an applet after it crashed,
+	 * for example */
+	if (l != NULL) {
+		panel_applets_loading = g_slist_delete_link (panel_applets_loading, l);
+		free_applet_to_load (applet);
+	}
 
 	if (panel_applets_loading == NULL && panel_applets_to_load == NULL)
 		panel_applet_queue_initial_unhide_toplevels ();