diff -r 0226ffea1a95 -r 34c1a17a91d7 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Sat Jul 07 00:30:45 2007 +0000 +++ b/pidgin/gtkconv.c Sat Jul 07 04:03:41 2007 +0000 @@ -4857,8 +4857,14 @@ gtkconv->convs = g_list_remove(gtkconv->convs, conv); /* Don't destroy ourselves until all our convos are gone */ - if (gtkconv->convs) + if (gtkconv->convs) { + /* Make sure the destroyed conversation is not the active one */ + if (gtkconv->active_conv == conv) { + gtkconv->active_conv = gtkconv->convs->data; + purple_conversation_update(gtkconv->active_conv, PURPLE_CONV_UPDATE_FEATURES); + } return; + } pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv);