From 587d0493c590a9bef832c70b73b182cd6868eb37 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 22 Sep 2013 14:47:17 +0100
Subject: [PATCH] Fix nickname change conflicts

fixes #242
---
 src/profanity.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/profanity.c b/src/profanity.c
index 613523f9..7d5df1a5 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -194,7 +194,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 {