Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim

Commits: d603a30f by Philipp Hörist at 2017-03-14T00:03:56+01:00 Fix return value and negativ timeout values

Fixes #8533

- - - - -

1 changed file:

- src/common/logger.py

Changes:

===================================== src/common/logger.py ===================================== --- a/src/common/logger.py +++ b/src/common/logger.py @@ -598,11 +598,11 @@ class Logger: # How many lines to restore and when to time them out restore_how_many = gajim.config.get('restore_lines') if restore_how_many <= 0: - return + return [] timeout = gajim.config.get('restore_timeout') # in minutes

now = int(float(time.time())) - if timeout != 0: + if timeout > 0: timeout = now - (timeout * 60) # before that they are too old # so if we ask last 5 lines and we have 2 pending we get # 3 - 8 (we avoid the last 2 lines but we still return 5 asked)

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d603a30f3a06319d5eecfb983615b50b6ed...