#5180: Toolbars are properly unregistering themselves on destruction.

radiant/eventmanager/EventManager.cpp

@@ -550,13 +550,38 @@ void EventManager::removeEvent(const std::string& eventName)
 
 void EventManager::disconnectToolbar(wxToolBar* toolbar)
 {
-	std::for_each(_events.begin(), _events.end(), [&] (EventMap::value_type& pair)
+	for (std::size_t tool = 0; tool < toolbar->GetToolsCount(); tool++)
+	{
+		for (auto it = _toolItems.begin(); it != _toolItems.end(); ++it)
+		{
+			auto toolItem = toolbar->GetToolByPos(tool);
+
+			if (it->second == toolItem)
+			{
+				auto evt = findEvent(it->first);
+
+				if (!evt->empty())
+				{
+					evt->disconnectToolItem(toolItem);
+				}
+				else
+				{
+					toolbar->Unbind(wxEVT_TOOL, &EventManager::onToolItemClicked, this, toolItem->GetId());
+				}
+
+				_toolItems.erase(it);
+				break;
+			}
+		}
+	}
+
+	for (EventMap::value_type& pair : _events)
 	{
 		for (std::size_t tool = 0; tool < toolbar->GetToolsCount(); tool++)
 		{
 			pair.second->disconnectToolItem(const_cast<wxToolBarToolBase*>(toolbar->GetToolByPos(static_cast<int>(tool))));
 		}
-	});
+	}
 }
 
 // Loads the default shortcuts from the registry

radiant/ui/mainframe/TopLevelFrame.cpp

@@ -91,6 +91,14 @@ wxToolBar* TopLevelFrame::getToolbar(IMainFrame::Toolbar type)
 	return (found != _toolbars.end()) ? found->second.get() : nullptr;
 }
 
+bool TopLevelFrame::Destroy()
+{
+	// Clear out any references to toolbars while the modules are still loaded
+	_toolbars.clear();
+
+	return wxFrame::Destroy();
+}
+
 wxMenuBar* TopLevelFrame::createMenuBar()
 {
     // Return the "main" menubar from the UIManager

radiant/ui/mainframe/TopLevelFrame.h

@@ -35,6 +35,8 @@ class TopLevelFrame :
 
 	wxToolBar* getToolbar(IMainFrame::Toolbar type);
 
+	virtual bool Destroy() override;
+
 private:
 	wxMenuBar* createMenuBar();
 

radiant/uimanager/ToolbarManager.cpp

@@ -149,11 +149,21 @@ wxToolBar* ToolbarManager::createToolbar(xml::Node& node, wxWindow* parent)
 		throw std::runtime_error("No elements in toolbar.");
 	}
 
-	// TODO: Subscribe to destroy event to deregister tool items
+	toolbar->Bind(wxEVT_DESTROY, &ToolbarManager::onToolbarDestroy, this);
 
 	return toolbar;
 }
 
+void ToolbarManager::onToolbarDestroy(wxWindowDestroyEvent& ev)
+{
+	auto toolbar = wxDynamicCast(ev.GetEventObject(), wxToolBar);
+
+	if (toolbar != nullptr)
+	{
+		GlobalEventManager().disconnectToolbar(toolbar);
+	}
+}
+
 bool ToolbarManager::toolbarExists(const std::string& toolbarName)
 {
 	return (_toolbars.find(toolbarName) != _toolbars.end());

radiant/uimanager/ToolbarManager.h

@@ -14,6 +14,7 @@
  * Obtain a loaded toolbar by calling getToolbar(<toolbarName>);
  */
 class wxToolBarToolBase;
+class wxWindowDestroyEvent;
 
 namespace ui {
 
@@ -53,6 +54,8 @@ class ToolbarManager :
 	wxToolBarToolBase* createToolItem(wxToolBar* toolbar, xml::Node& node);
 
 	bool toolbarExists(const std::string& toolbarName);
+
+	void onToolbarDestroy(wxWindowDestroyEvent& ev);
 };
 
 } // namespace ui