Merge pull request #107133 from timothyqiu/nothing

akien-mga · akien-mga · commit 3de0fa7b09a9 · 2025-06-05T13:13:56.000+02:00
Fix crash when inspecting Variant export variable
diff --git a/editor/editor_settings_dialog.cpp b/editor/editor_settings_dialog.cpp
@@ -1111,7 +1111,7 @@ void EditorSettingsPropertyWrapper::setup(const String &p_property, EditorProper
 }
 
 bool EditorSettingsInspectorPlugin::can_handle(Object *p_object) {
-	return p_object->is_class("SectionedInspectorFilter") && p_object != current_object;
+	return p_object && p_object->is_class("SectionedInspectorFilter") && p_object != current_object;
 }
 
 bool EditorSettingsInspectorPlugin::parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const BitField<PropertyUsageFlags> p_usage, const bool p_wide) {

Original file line number	Diff line number	Diff line change
`@@ -1111,7 +1111,7 @@ void EditorSettingsPropertyWrapper::setup(const String &p_property, EditorProper`
`1111`	`1111`	`}`
`1112`	`1112`
`1113`	`1113`	`bool EditorSettingsInspectorPlugin::can_handle(Object *p_object) {`
`1114`		`- return p_object->is_class("SectionedInspectorFilter") && p_object != current_object;`
	`1114`	`+ return p_object && p_object->is_class("SectionedInspectorFilter") && p_object != current_object;`
`1115`	`1115`	`}`
`1116`	`1116`
`1117`	`1117`	`bool EditorSettingsInspectorPlugin::parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const BitField<PropertyUsageFlags> p_usage, const bool p_wide) {`