Merge pull request godotengine#90559 from Rindbee/fix-crash-when-drag…

…-scene-file-to-screen Fix crash when dragging scene files to 2D/3D screen
Koyper · Apr 12, 2024 · 30e7178 · 30e7178
2 parents cabb3ca + 4ff5326
commit 30e7178
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -5944,7 +5944,7 @@ bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Varian
 				}
 
 				Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
-				if (_cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
+				if (edited_scene && !edited_scene->get_scene_file_path().is_empty() && _cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
 					memdelete(instantiated_scene);
 					can_instantiate = false;
 					is_cyclical_dep = true;

diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
@@ -4507,7 +4507,7 @@ bool Node3DEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant
 							continue;
 						}
 						Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
-						if (_cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
+						if (edited_scene && !edited_scene->get_scene_file_path().is_empty() && _cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
 							memdelete(instantiated_scene);
 							can_instantiate = false;
 							is_cyclical_dep = true;