Improved update missing parts

This commit is contained in:
Klaus Basan
2017-06-26 01:41:10 +02:00
committed by Mathew Sutcliffe
parent 0b85a7c02a
commit d96a9a9fa2

View File

@@ -533,6 +533,8 @@ namespace BlackMisc
} }
this->updateLocalFileNames(otherModel); this->updateLocalFileNames(otherModel);
if (this->hasValidDbKey() && otherModel.hasValidDbKey()) { return; } // both are DB data, treat as being the same except for filename maybe
if (this->m_callsign.isEmpty()) { this->setCallsign(otherModel.getCallsign()); } if (this->m_callsign.isEmpty()) { this->setCallsign(otherModel.getCallsign()); }
if (this->m_modelString.isEmpty()) { this->setModelString(otherModel.getModelString()); } if (this->m_modelString.isEmpty()) { this->setModelString(otherModel.getModelString()); }
if (this->m_name.isEmpty()) { this->setName(otherModel.getName()); } if (this->m_name.isEmpty()) { this->setName(otherModel.getName()); }