refs #832, unnecessary restriction to single entity

(assert removed)
This commit is contained in:
Klaus Basan
2016-12-13 18:36:22 +01:00
parent 16b9c88abf
commit e0b38fb296
2 changed files with 3 additions and 4 deletions

View File

@@ -256,11 +256,10 @@ namespace BlackGui
sGui->getWebDataServices()->triggerReadOfInfoObjects(); sGui->getWebDataServices()->triggerReadOfInfoObjects();
} }
void CDbLoadOverviewComponent::ps_dataLoaded(CEntityFlags::Entity singleEntity, CEntityFlags::ReadState state, int number) void CDbLoadOverviewComponent::ps_dataLoaded(CEntityFlags::Entity entities, CEntityFlags::ReadState state, int number)
{ {
Q_UNUSED(number); Q_UNUSED(number);
Q_ASSERT_X(CEntityFlags::isSingleEntity(singleEntity), Q_FUNC_INFO, "need single entity"); if (!entities.testFlag(CEntityFlags::InfoObjectEntity) && !CEntityFlags::anySwiftDbEntity(entities)) { return; }
if (!singleEntity.testFlag(CEntityFlags::InfoObjectEntity) && !CEntityFlags::anySwiftDbEntity(singleEntity)) { return; }
if (state == CEntityFlags::ReadFinished || state == CEntityFlags::ReadFinishedRestricted) if (state == CEntityFlags::ReadFinished || state == CEntityFlags::ReadFinishedRestricted)
{ {
this->m_reloading = false; this->m_reloading = false;

View File

@@ -96,7 +96,7 @@ namespace BlackGui
void ps_setValues(); void ps_setValues();
//! Data have been loaded //! Data have been loaded
void ps_dataLoaded(BlackMisc::Network::CEntityFlags::Entity singleEntity, BlackMisc::Network::CEntityFlags::ReadState state, int number); void ps_dataLoaded(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState state, int number);
}; };
} // ns } // ns
} // ns } // ns