flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 12:35:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #577, improved resolution of distributor

Browse Source
This commit is contained in:
Klaus Basan
2016-01-27 18:32:21 +01:00
parent 8f216f510f
commit 49b88978d2
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/blackgui/components/dbdistributorselectorcomponent.cpp
View File

@@ -84,8 +84,16 @@ namespace BlackGui
CDistributor CDbDistributorSelectorComponent::getDistributor() const CDistributor CDbDistributorSelectorComponent::getDistributor() const
{ {
if (!hasProvider()) { return CDistributor(); } if (!hasProvider()) { return CDistributor(); }
QString distributorKey(this->ui->le_Distributor->text().trimmed().toUpper()); QString distributorKeyOrAlias(this->ui->le_Distributor->text().trimmed().toUpper());
CDistributor d(getDistributors().findByKey(distributorKey)); if (distributorKeyOrAlias.isEmpty()) { return CDistributor(); }
if (this->m_currentDistributor.matchesKeyOrAlias(distributorKeyOrAlias)) { return this->m_currentDistributor; }
CDistributor d(getDistributors().findByKey(distributorKeyOrAlias));
if (d.hasValidDbKey())
{
// for some reason we have a new distributor here
// normally that should not happen
}
return d; return d;
} }
@@ -179,9 +187,9 @@ namespace BlackGui
void CDbDistributorSelectorComponent::ps_dataChanged() void CDbDistributorSelectorComponent::ps_dataChanged()
{ {
if (!hasProvider()) { return; } if (!hasProvider()) { return; }
QString key(this->ui->le_Distributor->text().trimmed().toUpper()); QString keyOrAlias(this->ui->le_Distributor->text().trimmed().toUpper());
if (key.isEmpty()) { return; } if (keyOrAlias.isEmpty()) { return; }
CDistributor d(this->getDistributors().findByKeyOrAlias(key)); CDistributor d(this->getDistributors().findByKeyOrAlias(keyOrAlias));
this->setDistributor(d); this->setDistributor(d);
} }