Commit f846e70c authored by JC Brand's avatar JC Brand

Merge branch 'master' into mockup

parents 15ed5133 7e0f5380
...@@ -1437,10 +1437,9 @@ ...@@ -1437,10 +1437,9 @@
}, },
showErrorMessage: function ($error, room) { showErrorMessage: function ($error, room) {
var $chat_content = this.$el.find('.chat-content');
// We didn't enter the room, so we must remove it from the MUC // We didn't enter the room, so we must remove it from the MUC
// add-on // add-on
converse.connection.muc.removeRoom(room.name); delete converse.connection.muc[room.name];
if ($error.attr('type') == 'auth') { if ($error.attr('type') == 'auth') {
if ($error.find('not-authorized').length) { if ($error.find('not-authorized').length) {
this.renderPasswordForm(); this.renderPasswordForm();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment