when we are disconnected while autoaway, don't loose previous status. fixes #2934
This commit is contained in:
parent
8f50d04ea8
commit
b02cdd378d
1 changed files with 6 additions and 1 deletions
|
@ -112,7 +112,7 @@ class Connection(ConnectionHandlers):
|
||||||
def _reconnect(self):
|
def _reconnect(self):
|
||||||
# Do not try to reco while we are already trying
|
# Do not try to reco while we are already trying
|
||||||
self.time_to_reconnect = None
|
self.time_to_reconnect = None
|
||||||
if self.connected < 2: #connection failed
|
if self.connected < 2: # connection failed
|
||||||
log.debug('reconnect')
|
log.debug('reconnect')
|
||||||
self.connected = 1
|
self.connected = 1
|
||||||
self.dispatch('STATUS', 'connecting')
|
self.dispatch('STATUS', 'connecting')
|
||||||
|
@ -152,6 +152,11 @@ class Connection(ConnectionHandlers):
|
||||||
if gajim.config.get_per('accounts', self.name, 'autoreconnect'):
|
if gajim.config.get_per('accounts', self.name, 'autoreconnect'):
|
||||||
self.connected = -1
|
self.connected = -1
|
||||||
self.dispatch('STATUS', 'error')
|
self.dispatch('STATUS', 'error')
|
||||||
|
if gajim.status_before_autoaway[self.name]:
|
||||||
|
# We were auto away. So go back online
|
||||||
|
self.status = gajim.status_before_autoaway[self.name]
|
||||||
|
gajim.status_before_autoaway[self.name] = ''
|
||||||
|
self.old_show = 'online'
|
||||||
# this check has moved from _reconnect method
|
# this check has moved from _reconnect method
|
||||||
# do exponential backoff until 15 minutes,
|
# do exponential backoff until 15 minutes,
|
||||||
# then small linear increase
|
# then small linear increase
|
||||||
|
|
Loading…
Add table
Reference in a new issue