aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-23 21:27:19 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-23 21:27:22 +0800
commitb7a5f478cc1e3828504f653b4a66b22f28523cb7 (patch)
treea14b19afd8942c99c0c0228d6e6bda384a7562fe
parent26ac10366710eb6e60539421ccf88c5e6833a58b (diff)
downloadgsoc2013-empathy-b7a5f478cc1e3828504f653b4a66b22f28523cb7.tar
gsoc2013-empathy-b7a5f478cc1e3828504f653b4a66b22f28523cb7.tar.gz
gsoc2013-empathy-b7a5f478cc1e3828504f653b4a66b22f28523cb7.tar.bz2
gsoc2013-empathy-b7a5f478cc1e3828504f653b4a66b22f28523cb7.tar.lz
gsoc2013-empathy-b7a5f478cc1e3828504f653b4a66b22f28523cb7.tar.xz
gsoc2013-empathy-b7a5f478cc1e3828504f653b4a66b22f28523cb7.tar.zst
gsoc2013-empathy-b7a5f478cc1e3828504f653b4a66b22f28523cb7.zip
chat_window_new_message_cb: check that we found the chatroom
There is a race, if the chatroom manager didn't parse the chatrooms list yet, this was crashing.
-rw-r--r--src/empathy-chat-window.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index bf1ef6b0b..aacc301b3 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1451,7 +1451,7 @@ chat_window_new_message_cb (EmpathyChat *chat,
chatroom = empathy_chatroom_manager_find (priv->chatroom_manager,
account, room);
- if (empathy_chatroom_is_always_urgent (chatroom)) {
+ if (chatroom != NULL && empathy_chatroom_is_always_urgent (chatroom)) {
needs_urgency = TRUE;
} else {
needs_urgency = empathy_message_should_highlight (message);