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

Ref T515, minor tweaks

Browse Source
This commit is contained in:
Klaus Basan
2019-01-17 17:16:37 +01:00
committed by Mat Sutcliffe
parent 107464d92a
commit 5c1f6d9029
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackgui/menus/aircraftmodelmenus.cpp
View File

@@ -179,7 +179,7 @@ namespace BlackGui
void CConsolidateWithDbDataMenu::customMenu(CMenuActions &menuActions)
{
const CAircraftModelView *mv = modelView();
if (mv->isEmpty()) { this->nestedCustomMenu(menuActions); return; }
if (!mv || mv->isEmpty()) { this->nestedCustomMenu(menuActions); return; }
if (!sGui->hasWebDataServices()) { this->nestedCustomMenu(menuActions); return; }
menuActions.addMenuConsolidateModels();
@@ -194,9 +194,7 @@ namespace BlackGui
void CConsolidateWithDbDataMenu::consolidateData()
{
BLACK_VERIFY_X(sGui, Q_FUNC_INFO, "Missing sGui");
if (!sGui->hasWebDataServices()) { return; }
if (!sGui || sGui->isShuttingDown() || !sGui->hasWebDataServices()) { return; }
const CAircraftModelList dbModels(sGui->getWebDataServices()->getModels());
if (dbModels.isEmpty())
{

2
src/blackgui/menus/aircraftmodelmenus.h
View File

@@ -81,7 +81,7 @@ namespace BlackGui
QAction *m_modelConverterX = nullptr;
};
//! Merge with DB data
//! Consolidate/merge with DB data
class CConsolidateWithDbDataMenu : public IAircraftModelViewMenu
{
Q_OBJECT

2
src/blackgui/views/aircraftmodelview.cpp
View File

@@ -100,7 +100,7 @@ namespace BlackGui
int CAircraftModelView::applyToSelected(const CDistributor &distributor)
{
if (!hasSelection()) { return 0; }
int c = this->updateSelected(CVariant::from(distributor), CAircraftModel::IndexDistributor);
const int c = this->updateSelected(CVariant::from(distributor), CAircraftModel::IndexDistributor);
return c;
}