diff options
| author | James Booth <boothj5@gmail.com> | 2013-09-22 14:47:17 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-09-22 14:47:17 +0100 |
| commit | ab5eadc559df2fd8ce2ec00abaca2f40fff05cff (patch) | |
| tree | 6dc86cd11459c98847ddb8df9b6c5eae8703a0b0 | |
| parent | d70245c8870426382959d9d23199a34e72fc7aa5 (diff) | |
| download | profani-tty-ab5eadc559df2fd8ce2ec00abaca2f40fff05cff.tar.gz | |
Fix nickname change conflicts
fixes #242
| -rw-r--r-- | src/profanity.c | 4 |
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 { |