Fix object lifetimes for view sensitive widgets in the UI.

1 files changed, 3 insertions, 1 deletions

diff --git a/ui/sidebar.h b/ui/sidebar.h
index ead1ca8d..56bf98ce 100644
--- a/ui/sidebar.h
+++ b/ui/sidebar.h
@@ -145,6 +145,7 @@ class BINARYNINJAUIAPI SidebarWidgetType
 	void updateTheme();
 };
 
+class FileContext;
 class ViewFrame;
 
 /*!
@@ -177,7 +178,8 @@ class BINARYNINJAUIAPI SidebarWidgetContainer : public QWidget
 	SidebarWidgetType* m_lastContentActive = nullptr;
 	SidebarWidgetType* m_referenceActive = nullptr;
 	SidebarWidgetType* m_pendingReferenceType = nullptr;
-	std::map<ViewFrame*, std::map<QString, std::map<SidebarWidgetType*, SidebarWidgetAndHeader*>>> m_widgets;
+	std::map<FileContext*, std::map<QString, std::map<SidebarWidgetType*, SidebarWidgetAndHeader*>>> m_widgets;
+	std::map<FileContext*, std::set<ViewFrame*>> m_frames;
 	std::map<SplitPaneWidget*, std::map<QString, std::pair<SidebarWidgetType*, SidebarWidgetType*>>> m_priorWidgets;
 	std::map<SplitPaneWidget*, std::map<QString, QList<int>>> m_priorContentSplitterSizes;
 	std::map<SplitPaneWidget*, std::map<QString, QList<int>>> m_priorParentSplitterSizes;