about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2013-09-22 14:47:17 +0100
committerJames Booth <boothj5@gmail.com>2013-09-22 14:47:17 +0100
commitab5eadc559df2fd8ce2ec00abaca2f40fff05cff (patch)
tree6dc86cd11459c98847ddb8df9b6c5eae8703a0b0 /src
parentd70245c8870426382959d9d23199a34e72fc7aa5 (diff)
downloadprofani-tty-ab5eadc559df2fd8ce2ec00abaca2f40fff05cff.tar.gz
Fix nickname change conflicts
fixes #242
Diffstat (limited to 'src')
-rw-r--r--src/profanity.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/profanity.c b/src/profanity.c
index bcb59395..48f8a3f5 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -198,7 +198,9 @@ prof_handle_error_message(const char *from, const char *err_msg)
         }
         // remove the room from muc
         Jid *room_jid = jid_create(from);
-        muc_leave_room(room_jid->barejid);
+        if (!muc_get_roster_received(room_jid->barejid)) {
+            muc_leave_room(room_jid->barejid);
+        }
         jid_destroy(room_jid);
 
     } else {