diff options
| author | Alexander Cherniuk <ts33kr@gmail.com> | 2010-03-28 16:36:51 +0400 |
|---|---|---|
| committer | Alexander Cherniuk <ts33kr@gmail.com> | 2010-03-28 16:36:51 +0400 |
| commit | 0e0d6daa163826d6941e49c6789114f96624d04b (patch) | |
| tree | 75dfb3c12923b0b4861bc6deee75e1c8ade56171 | |
| parent | 3c1045f831b3db2d432dc55f108f477c12329ecf (diff) | |
Fixed the autorejoin bug with overlimited MUC. Fixes #5678
| -rw-r--r-- | src/common/connection_handlers.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index 92e1aa0e6..9e56180d5 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -2318,10 +2318,11 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, prio, keyID, timestamp, None)) elif (errcode == '503'): - # maximum user number reached - self.dispatch('ERROR', (_('Unable to join group chat'), - _('Maximum number of users for %s has been reached') % \ - room_jid)) + if gc_control is None or gc_control.autorejoin is None: + # maximum user number reached + self.dispatch('ERROR', (_('Unable to join group chat'), + _('Maximum number of users for %s has been reached') % \ + room_jid)) elif (errcode == '401') or (errcon == 'not-authorized'): # password required to join self.dispatch('GC_PASSWORD_REQUIRED', (room_jid, nick)) |