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-24 17:05:54 +0800
commit7b7363be0b28fcf89502036eea4d653e2244f827 (patch)
tree9d2dd10f72e59b1ca665caf9593829bc3a86dd8d
parent93519f10b6c247017920a39fc0122c3310bfe062 (diff)
downloadgsoc2013-empathy-7b7363be0b28fcf89502036eea4d653e2244f827.tar
gsoc2013-empathy-7b7363be0b28fcf89502036eea4d653e2244f827.tar.gz
gsoc2013-empathy-7b7363be0b28fcf89502036eea4d653e2244f827.tar.bz2
gsoc2013-empathy-7b7363be0b28fcf89502036eea4d653e2244f827.tar.lz
gsoc2013-empathy-7b7363be0b28fcf89502036eea4d653e2244f827.tar.xz
gsoc2013-empathy-7b7363be0b28fcf89502036eea4d653e2244f827.tar.zst
gsoc2013-empathy-7b7363be0b28fcf89502036eea4d653e2244f827.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 32339bde4..0674283f2 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1434,7 +1434,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);