1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into osx-functional

This commit is contained in:
James Booth 2015-08-23 23:58:41 +01:00
commit d61e1b3149

View File

@ -707,6 +707,8 @@ ui_close_connected_win(int index)
ProfMucWin *mucwin = (ProfMucWin*) window; ProfMucWin *mucwin = (ProfMucWin*) window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
presence_leave_chat_room(mucwin->roomjid); presence_leave_chat_room(mucwin->roomjid);
muc_leave(mucwin->roomjid);
ui_leave_room(mucwin->roomjid);
} else if (window->type == WIN_CHAT) { } else if (window->type == WIN_CHAT) {
ProfChatWin *chatwin = (ProfChatWin*) window; ProfChatWin *chatwin = (ProfChatWin*) window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);