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

[xswiftbus] Fix destroying of removed menu items

Browse Source
This commit is contained in:
Roland Winklmeier
2018-04-20 17:00:04 +02:00
parent 0ad18cd0a4
commit 7de5c06c7a
3 changed files with 63 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/xswiftbus/traffic.cpp
View File

@@ -233,7 +233,12 @@ namespace XSwiftBus
void CTraffic::removePlane(const std::string &callsign)
{
m_planeViewMenuItems.erase(callsign);
auto menuItemIt = m_planeViewMenuItems.find(callsign);
if (menuItemIt != m_planeViewMenuItems.end())
{
m_planeViewSubMenu.removeItem(menuItemIt->second);
m_planeViewMenuItems.erase(menuItemIt);
}
auto planeIt = m_planesByCallsign.find(callsign);
if (planeIt == m_planesByCallsign.end()) { return; }
@@ -254,6 +259,13 @@ namespace XSwiftBus
XPMPDestroyPlane(plane->id);
delete plane;
}
for (const auto &kv : m_planeViewMenuItems)
{
CMenuItem item = kv.second;
m_planeViewSubMenu.removeItem(item);
}
m_planesByCallsign.clear();
m_planesById.clear();
m_planeViewMenuItems.clear();