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

refs #800, fixed issues reported by MS

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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

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

11
src/blackgui/views/viewbase.cpp
View File

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