From 8a91aad6dee885e0779c650d1bd238d6ddc52543 Mon Sep 17 00:00:00 2001 From: Inso <insomniak.fr@gmail.com> Date: Sat, 12 Sep 2015 16:54:58 +0200 Subject: [PATCH] Fix crashes in identities_tab --- src/cutecoin/gui/community_tile.py | 5 ++++- src/cutecoin/gui/identities_tab.py | 9 +++++---- src/cutecoin/models/identities.py | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/cutecoin/gui/community_tile.py b/src/cutecoin/gui/community_tile.py index c5f51be3..228fd38f 100644 --- a/src/cutecoin/gui/community_tile.py +++ b/src/cutecoin/gui/community_tile.py @@ -35,8 +35,11 @@ class CommunityTile(QFrame): amount = yield from self.app.current_account.amount(self.community) localized_amount = yield from self.app.current_account.current_ref(amount, self.community, self.app).localized(units=True) - localized_monetary_mass = yield from self.app.current_account.current_ref(current_block['monetaryMass'], + if current_block['monetaryMass']: + localized_monetary_mass = yield from self.app.current_account.current_ref(current_block['monetaryMass'], self.community, self.app).localized(units=True) + else: + localized_monetary_mass = "" status = self.tr("Member") if self.app.current_account.pubkey in members_pubkeys \ else self.tr("Non-Member") description = """<html> diff --git a/src/cutecoin/gui/identities_tab.py b/src/cutecoin/gui/identities_tab.py index d033e755..6af8313e 100644 --- a/src/cutecoin/gui/identities_tab.py +++ b/src/cutecoin/gui/identities_tab.py @@ -177,22 +177,23 @@ class IdentitiesTabWidget(QWidget, Ui_IdentitiesTab): @asyncify @asyncio.coroutine - def _async_search_members(self): + def _async_search_members(self, checked=False): """ Search members of community and display found members """ if self.community: - pubkeys = self.community.members_pubkeys() + pubkeys = yield from self.community.members_pubkeys() identities = [] for p in pubkeys: - identities.append(self.app.identities_registry.find(p, self.community)) + identity = yield from self.app.identities_registry.future_find(p, self.community) + identities.append(identity) self.edit_textsearch.clear() self.refresh_identities(identities) @asyncify @asyncio.coroutine - def _async_search_direct_connections(self): + def _async_search_direct_connections(self, checked=False): """ Search members of community and display found members """ diff --git a/src/cutecoin/models/identities.py b/src/cutecoin/models/identities.py index 9ec30c98..a90824ff 100644 --- a/src/cutecoin/models/identities.py +++ b/src/cutecoin/models/identities.py @@ -127,8 +127,8 @@ class IdentitiesTableModel(QAbstractTableModel): :param cutecoin.core.registry.IdentitiesRegistry identities: The new identities to display """ logging.debug("Refresh {0} identities".format(len(identities))) - self.identities_data = [] self.beginResetModel() + self.identities_data = [] for identity in identities: data = yield from self.identity_data(identity) self.identities_data.append(data) -- GitLab