diff options
| author | Christian S <christian@pix-art.de> | 2016-04-21 20:12:14 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-21 20:12:14 +0200 |
| commit | f7c700880a537064ab88001431b6040909920b44 (patch) | |
| tree | fcc0d16bd71a18ba959284ab31a4d345b5383d3e /src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | |
| parent | 9e15ac10ccc4d021c10eeaed8988fa14ea73e3dc (diff) | |
| parent | 1a073ca45455dcf46bb4d8bcaa962030a65c435a (diff) | |
Merge branch 'refs/heads/siacs/master' into welcome-screen
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index a8b667cee..2e40b5221 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -546,7 +546,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate } updateAccountInformation(true); } - } else if (this.xmppConnectionService.getAccounts().size() == 0) { + } + if (this.xmppConnectionService.getAccounts().size() == 0 + || this.mAccount == xmppConnectionService.getPendingAccount()) { if (getActionBar() != null) { getActionBar().setDisplayHomeAsUpEnabled(false); getActionBar().setDisplayShowHomeEnabled(false); |