refs #800, fixed issues reported by MS

https://dev.vatsim-germany.org/issues/800#note-2
This commit is contained in:
Klaus Basan
2016-11-10 21:52:38 +01:00
parent 874f477611
commit 5babb26861
2 changed files with 8 additions and 4 deletions

View File

@@ -75,7 +75,6 @@ namespace BlackGui
menuActions.addMenuSimulator();
if (this->m_messageFrame)
{
const CAircraftModel model(mv->selectedObject());
if (!model.getIconPath().isEmpty())
{
this->m_iconAction = menuActions.addAction(this->m_iconAction, CIcons::appAircraft16(), "Display icon", CMenuAction::pathSimulator(), { this, &CShowSimulatorFileMenu::ps_displayIcon });

View File

@@ -438,9 +438,14 @@ namespace BlackGui
if (name.isEmpty())
{
// create a name
if (this->getDockWidgetInfoArea()) { name = this->getDockWidgetInfoArea()->windowTitle(); }
else if (!windowTitle().isEmpty()) { name = this->windowType(); }
else { name = this->metaObject()->className(); }
if (this->getDockWidgetInfoArea())
{
name = this->getDockWidgetInfoArea()->windowTitle();
}
else
{
name = this->metaObject()->className();
}
}
if (!name.endsWith(CFileUtils::jsonAppendix(), Qt::CaseInsensitive))
{