Handle chat states for users not in roster

issue #397

2 files changed, 14 insertions, 6 deletions

diff --git a/src/ui/console.c b/src/ui/console.c
index ebd876bd..3fd1caac 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -135,10 +135,14 @@ static void
 _cons_show_typing(const char * const barejid)
 {
     ProfWin *console = wins_get_console();
-    PContact contact = roster_get_contact(barejid);
     const char * display_usr = NULL;
-    if (p_contact_name(contact) != NULL) {
-        display_usr = p_contact_name(contact);
+    PContact contact = roster_get_contact(barejid);
+    if (contact != NULL) {
+        if (p_contact_name(contact) != NULL) {
+            display_usr = p_contact_name(contact);
+        } else {
+            display_usr = barejid;
+        }
     } else {
         display_usr = barejid;
     }
diff --git a/src/ui/core.c b/src/ui/core.c
index 580f8691..6c3ed470 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -1258,10 +1258,14 @@ _ui_recipient_gone(const char * const barejid)
     if (barejid == NULL)
         return;
 
-    PContact contact = roster_get_contact(barejid);
     const char * display_usr = NULL;
-    if (p_contact_name(contact) != NULL) {
-        display_usr = p_contact_name(contact);
+    PContact contact = roster_get_contact(barejid);
+    if (contact != NULL) {
+        if (p_contact_name(contact) != NULL) {
+            display_usr = p_contact_name(contact);
+        } else {
+            display_usr = barejid;
+        }
     } else {
         display_usr = barejid;
     }