don't traceback when deleting an account. Fixes #8199
This commit is contained in:
parent
cb36bc7abe
commit
eb30ad07bd
1 changed files with 4 additions and 0 deletions
|
@ -115,6 +115,8 @@ class RosterWindow:
|
||||||
|
|
||||||
if self.regroup:
|
if self.regroup:
|
||||||
name = 'MERGED'
|
name = 'MERGED'
|
||||||
|
if name not in self._iters:
|
||||||
|
return None
|
||||||
it = self._iters[name]['account']
|
it = self._iters[name]['account']
|
||||||
|
|
||||||
if model == self.model or it is None:
|
if model == self.model or it is None:
|
||||||
|
@ -145,6 +147,8 @@ class RosterWindow:
|
||||||
if self.regroup:
|
if self.regroup:
|
||||||
account = 'MERGED'
|
account = 'MERGED'
|
||||||
|
|
||||||
|
if account not in self._iters:
|
||||||
|
return None
|
||||||
if name not in self._iters[account]['groups']:
|
if name not in self._iters[account]['groups']:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue