Traktor: Ensure "m_site" is null after editor page being destroyed.

apistol78 · May 10, 2024 · 447a0ab · 447a0ab
1 parent ee84d77
commit 447a0ab
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 15 deletions.
diff --git a/code/Animation/Editor/AnimationGraphEditorPage.cpp b/code/Animation/Editor/AnimationGraphEditorPage.cpp
@@ -143,12 +143,16 @@ bool AnimationGraphEditorPage::create(ui::Container* parent)
 
 void AnimationGraphEditorPage::destroy()
 {
-	m_site->destroyAdditionalPanel(m_propertiesView);
-	m_site->destroyAdditionalPanel(m_containerPreview);
+	if (m_propertiesView)
+		m_site->destroyAdditionalPanel(m_propertiesView);
+	if (m_containerPreview)
+		m_site->destroyAdditionalPanel(m_containerPreview);
 
 	safeDestroy(m_propertiesView);
 	safeDestroy(m_containerPreview);
 	safeDestroy(m_editorGraph);
+
+	m_site = nullptr;
 }
 
 bool AnimationGraphEditorPage::dropInstance(db::Instance* instance, const ui::Point& position)

diff --git a/code/Input/Editor/InputMappingEditor.cpp b/code/Input/Editor/InputMappingEditor.cpp
@@ -261,11 +261,15 @@ bool InputMappingEditor::create(ui::Container* parent)
 
 void InputMappingEditor::destroy()
 {
-	m_site->destroyAdditionalPanel(m_propertiesView);
-	m_site->destroyAdditionalPanel(m_listValueSources);
+	if (m_propertiesView)
+		m_site->destroyAdditionalPanel(m_propertiesView);
+	if (m_listValueSources)
+		m_site->destroyAdditionalPanel(m_listValueSources);
 
 	safeDestroy(m_propertiesView);
 	safeDestroy(m_listValueSources);
+
+	m_site = nullptr;
 }
 
 bool InputMappingEditor::dropInstance(db::Instance* instance, const ui::Point& position)

diff --git a/code/Render/Editor/Image2/ImageGraphEditorPage.cpp b/code/Render/Editor/Image2/ImageGraphEditorPage.cpp
@@ -120,10 +120,13 @@ bool ImageGraphEditorPage::create(ui::Container* parent)
 
 void ImageGraphEditorPage::destroy()
 {
-	m_site->destroyAdditionalPanel(m_propertiesView);
+	if (m_propertiesView)
+		m_site->destroyAdditionalPanel(m_propertiesView);
 
 	safeDestroy(m_propertiesView);	
 	safeDestroy(m_editorGraph);
+
+	m_site = nullptr;
 }
 
 bool ImageGraphEditorPage::dropInstance(db::Instance* instance, const ui::Point& position)

diff --git a/code/Render/Editor/Shader/ShaderGraphEditorPage.cpp b/code/Render/Editor/Shader/ShaderGraphEditorPage.cpp
@@ -502,8 +502,10 @@ void ShaderGraphEditorPage::destroy()
 		m_site->destroyAdditionalPanel(m_shaderViewer);
 	}
 
-	m_site->destroyAdditionalPanel(m_dataContainer);
-	m_site->destroyAdditionalPanel(m_propertiesView);
+	if (m_dataContainer)
+		m_site->destroyAdditionalPanel(m_dataContainer);
+	if (m_propertiesView)
+		m_site->destroyAdditionalPanel(m_propertiesView);
 
 	m_nodeFacades.clear();
 	safeDestroy(m_editorGraph);
@@ -512,6 +514,8 @@ void ShaderGraphEditorPage::destroy()
 	safeDestroy(m_dataContainer);
 	safeDestroy(m_propertiesView);
 	safeDestroy(m_menuQuick);
+
+	m_site = nullptr;
 }
 
 bool ShaderGraphEditorPage::dropInstance(db::Instance* instance, const ui::Point& position)

diff --git a/code/Render/Editor/Texture/TextureAssetEditorPage.cpp b/code/Render/Editor/Texture/TextureAssetEditorPage.cpp
@@ -90,6 +90,7 @@ void TextureAssetEditorPage::destroy()
 	safeDestroy(m_propertiesView);
 
 	m_asset = nullptr;
+	m_site = nullptr;
 }
 
 bool TextureAssetEditorPage::dropInstance(db::Instance* instance, const ui::Point& position)

diff --git a/code/Scene/Editor/SceneEditorPage.cpp b/code/Scene/Editor/SceneEditorPage.cpp
@@ -524,9 +524,12 @@ void SceneEditorPage::destroy()
 		m_context->getControllerEditor()->destroy();
 
 	// Destroy panels.
-	m_site->destroyAdditionalPanel(m_entityPanel);
-	m_site->destroyAdditionalPanel(m_tabMisc);
-	m_site->destroyAdditionalPanel(m_controllerPanel);
+	if (m_entityPanel)
+		m_site->destroyAdditionalPanel(m_entityPanel);
+	if (m_tabMisc)
+		m_site->destroyAdditionalPanel(m_tabMisc);
+	if (m_controllerPanel)
+		m_site->destroyAdditionalPanel(m_controllerPanel);
 
 	// Destroy widgets.
 	safeDestroy(m_editPanel);
@@ -542,6 +545,7 @@ void SceneEditorPage::destroy()
 		m_context->getPhysicsManager()->destroy();
 
 	safeDestroy(m_context);
+	m_site = nullptr;
 }
 
 bool SceneEditorPage::dropInstance(db::Instance* instance, const ui::Point& position)

diff --git a/code/Script/Editor/ScriptEditorPage.cpp b/code/Script/Editor/ScriptEditorPage.cpp
@@ -269,7 +269,7 @@ bool ScriptEditorPage::create(ui::Container* parent)
 
 void ScriptEditorPage::destroy()
 {
-	if (m_scriptDebuggerSessions != nullptr)
+	if (m_scriptDebuggerSessions)
 	{
 		m_scriptDebuggerSessions->removeListener(this);
 		m_scriptDebuggerSessions = nullptr;
@@ -279,8 +279,11 @@ void ScriptEditorPage::destroy()
 	m_scriptCompiler = nullptr;
 
 	// Destroy panels.
-	m_site->destroyAdditionalPanel(m_containerExplorer);
+	if (m_containerExplorer)
+		m_site->destroyAdditionalPanel(m_containerExplorer);
+
 	safeDestroy(m_containerExplorer);
+	m_site = nullptr;
 }
 
 bool ScriptEditorPage::dropInstance(db::Instance* instance, const ui::Point& position)

diff --git a/code/Sound/Editor/Processor/GraphEditor.cpp b/code/Sound/Editor/Processor/GraphEditor.cpp
@@ -192,10 +192,13 @@ void GraphEditor::destroy()
 
 	m_soundPlayer = nullptr;
 
-	m_site->destroyAdditionalPanel(m_propertiesView);
+	if (m_propertiesView)
+		m_site->destroyAdditionalPanel(m_propertiesView);
 
 	safeDestroy(m_propertiesView);
 	safeDestroy(m_resourceManager);
+
+	m_site = nullptr;
 }
 
 bool GraphEditor::dropInstance(db::Instance* instance, const ui::Point& position)

diff --git a/code/Spray/Editor/EffectEditorPage.cpp b/code/Spray/Editor/EffectEditorPage.cpp
@@ -238,14 +238,18 @@ void EffectEditorPage::destroy()
 	m_audioSystem = nullptr;
 
 	// Destroy panels.
-	m_site->destroyAdditionalPanel(m_containerSequencer);
-	m_site->destroyAdditionalPanel(m_propertiesView);
+	if (m_containerSequencer)
+		m_site->destroyAdditionalPanel(m_containerSequencer);
+	if (m_propertiesView)
+		m_site->destroyAdditionalPanel(m_propertiesView);
 
 	// Destroy widgets.
 	safeDestroy(m_propertiesView);
 	safeDestroy(m_containerSequencer);
 	safeDestroy(m_previewControl);
 	safeDestroy(m_resourceManager);
+
+	m_site = nullptr;
 }
 
 bool EffectEditorPage::dropInstance(db::Instance* instance, const ui::Point& position)