This commit is contained in:
Klaus Basan
2019-04-15 19:25:42 +02:00
parent 8cf79a512a
commit 4ed0d6befd
7 changed files with 11 additions and 13 deletions

View File

@@ -110,7 +110,7 @@ namespace BlackGui
ui->editor_Com->setTransponder(transponder); ui->editor_Com->setTransponder(transponder);
// selected stations // selected stations
if (sGui->getIContextNetwork()) if (sGui && sGui->getIContextNetwork())
{ {
const CAtcStationList selectedStations = sGui->getIContextNetwork()->getSelectedAtcStations(); const CAtcStationList selectedStations = sGui->getIContextNetwork()->getSelectedAtcStations();
ui->editor_Com->setSelectedAtcStations(selectedStations); ui->editor_Com->setSelectedAtcStations(selectedStations);

View File

@@ -33,7 +33,7 @@ namespace BlackGui
explicit CDbOwnModelsDialog(QWidget *parent = nullptr); explicit CDbOwnModelsDialog(QWidget *parent = nullptr);
//! Destructor //! Destructor
virtual ~CDbOwnModelsDialog(); virtual ~CDbOwnModelsDialog() override;
//! \copydoc CDbOwnModelsComponent::setSimulator //! \copydoc CDbOwnModelsComponent::setSimulator
void setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator); void setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator);

View File

@@ -32,7 +32,7 @@ namespace BlackGui
explicit CDbOwnModelSetDialog(QWidget *parent = nullptr); explicit CDbOwnModelSetDialog(QWidget *parent = nullptr);
//! Destructor //! Destructor
virtual ~CDbOwnModelSetDialog(); virtual ~CDbOwnModelSetDialog() override;
//! \copydoc CDbOwnModelSetComponent::setSimulator //! \copydoc CDbOwnModelSetComponent::setSimulator
void setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator); void setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator);

View File

@@ -19,10 +19,8 @@
#include <QObject> #include <QObject>
#include <QScopedPointer> #include <QScopedPointer>
class QWidget;
namespace BlackMisc { class CLogCategoryList; }
namespace Ui { class CDbOwnModelSetFormDialog; } namespace Ui { class CDbOwnModelSetFormDialog; }
namespace BlackMisc { class CLogCategoryList; }
namespace BlackGui namespace BlackGui
{ {
namespace Components namespace Components

View File

@@ -1052,7 +1052,7 @@ namespace BlackGui
m_updateDialog = new CUpdateInfoDialog(this->mainApplicationWidget()); m_updateDialog = new CUpdateInfoDialog(this->mainApplicationWidget());
} }
if (onlyIfNew && !m_updateDialog->isNewVersionAvailable()) return; if (onlyIfNew && !m_updateDialog->isNewVersionAvailable()) { return; }
const int result = m_updateDialog->exec(); const int result = m_updateDialog->exec();
if (result != QDialog::Accepted) { return; } if (result != QDialog::Accepted) { return; }
} }