diff options
author | James Booth <boothj5@gmail.com> | 2013-09-23 01:38:48 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2013-09-23 01:38:48 +0100 |
commit | aac605ccbb13c1f47f0588b2985caa2a98f76544 (patch) | |
tree | 33a835b32b8771582356f5245310897aff4496ef /src/profanity.c | |
parent | df63d37a3e768634e42ded9b40685edb24d85814 (diff) | |
parent | ce3b99f5771809f38119e9449099bdb1b0768b8f (diff) | |
download | profani-tty-aac605ccbb13c1f47f0588b2985caa2a98f76544.tar.gz |
Merge branch 'master' into otr
Diffstat (limited to 'src/profanity.c')
-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 5ecd2974..6ea7ff79 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 { |