diff options
author | kruks23 <scardenas@openmailbox.org> | 2014-05-18 19:10:52 +0200 |
---|---|---|
committer | kruks23 <scardenas@openmailbox.org> | 2014-05-18 19:10:52 +0200 |
commit | e27bb52575df02d21aa685705f11fcdf7f74889c (patch) | |
tree | 717985d47b4dd9f98112618dba960ed5f078eb1e /src/eu/siacs/conversations/entities/Account.java | |
parent | b79ff3af6c8f5de936eff26ee6235bcb5ca23b30 (diff) | |
parent | 590e2403ab6d9d8f3b0158bf5218802216e9cd50 (diff) |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations/entities/Account.java')
-rw-r--r-- | src/eu/siacs/conversations/entities/Account.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/entities/Account.java b/src/eu/siacs/conversations/entities/Account.java index 35870aaa..3e7ad97f 100644 --- a/src/eu/siacs/conversations/entities/Account.java +++ b/src/eu/siacs/conversations/entities/Account.java @@ -135,7 +135,7 @@ public class Account extends AbstractEntity{ } public boolean hasErrorStatus() { - return getStatus() > STATUS_NO_INTERNET; + return getStatus() > STATUS_NO_INTERNET && (getXmppConnection().getAttempt() >= 2); } public void setResource(String resource) { |