aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/bee_chat.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-10-02 19:45:26 -0700
committerWilmer van der Gaast <wilmer@gaast.net>2010-10-02 19:45:26 -0700
commit8e9e2b7d9e54744cee32b3724391bf0ad04e8aff (patch)
tree6cafdc57bb8143306daf8ef8288d09754f39b451 /protocols/bee_chat.c
parent88de0c96136313e553113f69cfc6ae544a5f5954 (diff)
parent2af3e232ff468b288dd4e0dbdab1a17312d801c5 (diff)
Merging mainline, which includes a huge msnp13 merge.
Not 100% sure about the OpenSSL merge, should double check that but I'm currently offline.
Diffstat (limited to 'protocols/bee_chat.c')
-rw-r--r--protocols/bee_chat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/protocols/bee_chat.c b/protocols/bee_chat.c
index 0314cae5..349e0547 100644
--- a/protocols/bee_chat.c
+++ b/protocols/bee_chat.c
@@ -195,7 +195,7 @@ void imcb_chat_remove_buddy( struct groupchat *c, const char *handle, const char
bu = bee_user_by_handle( bee, ic, handle );
}
- if( bee->ui->chat_remove_user )
+ if( bee->ui->chat_remove_user && bu )
bee->ui->chat_remove_user( bee, c, bu );
}