Browse Source

Merge pull request #4482 from dogmaphobic/pluginManager

Add MAV_AUTOPILOT_GENERIC only once.
QGC4.4
Gus Grubba 8 years ago committed by GitHub
parent
commit
643a656e13
  1. 5
      src/FirmwarePlugin/FirmwarePluginManager.cc

5
src/FirmwarePlugin/FirmwarePluginManager.cc

@ -30,14 +30,11 @@ QList<MAV_AUTOPILOT> FirmwarePluginManager::knownFirmwareTypes(void)
{ {
if (_knownFirmwareTypes.isEmpty()) { if (_knownFirmwareTypes.isEmpty()) {
QList<FirmwarePluginFactory*> factoryList = FirmwarePluginFactoryRegister::instance()->pluginFactories(); QList<FirmwarePluginFactory*> factoryList = FirmwarePluginFactoryRegister::instance()->pluginFactories();
for (int i = 0; i < factoryList.count(); i++) { for (int i = 0; i < factoryList.count(); i++) {
_knownFirmwareTypes.append(factoryList[i]->knownFirmwareTypes()); _knownFirmwareTypes.append(factoryList[i]->knownFirmwareTypes());
} }
}
_knownFirmwareTypes.append(MAV_AUTOPILOT_GENERIC); _knownFirmwareTypes.append(MAV_AUTOPILOT_GENERIC);
}
return _knownFirmwareTypes; return _knownFirmwareTypes;
} }

Loading…
Cancel
Save