Merge pull request godotengine#101182 from stuartcarnie/editor_crash_import

akien-mga · akien-mga · commit 21a6bd8dcac4 · 2025-01-06T22:49:29.000+01:00
Editor: Fix crash when using `--import --verbose` due to use-after-free
diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp
@@ -522,6 +522,14 @@ void EditorResourcePreview::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("preview_invalidated", PropertyInfo(Variant::STRING, "path")));
 }
 
+void EditorResourcePreview::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_EXIT_TREE: {
+			stop();
+		} break;
+	}
+}
+
 void EditorResourcePreview::check_for_invalidation(const String &p_path) {
 	bool call_invalidated = false;
 	{
diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h
@@ -123,6 +123,7 @@ class EditorResourcePreview : public Node {
 	void _update_thumbnail_sizes();
 
 protected:
+	void _notification(int p_what);
 	static void _bind_methods();
 
 public:

Original file line number	Diff line number	Diff line change
`@@ -522,6 +522,14 @@ void EditorResourcePreview::_bind_methods() {`
`522`	`522`	`ADD_SIGNAL(MethodInfo("preview_invalidated", PropertyInfo(Variant::STRING, "path")));`
`523`	`523`	`}`
`524`	`524`
	`525`	`+void EditorResourcePreview::_notification(int p_what) {`
	`526`	`+ switch (p_what) {`
	`527`	`+ case NOTIFICATION_EXIT_TREE: {`
	`528`	`+ stop();`
	`529`	`+ } break;`
	`530`	`+ }`
	`531`	`+}`
	`532`	`+`
`525`	`533`	`void EditorResourcePreview::check_for_invalidation(const String &p_path) {`
`526`	`534`	`bool call_invalidated = false;`
`527`	`535`	`{`