From 2bcb9d2a046ffc63c95e9cb64f7b0c551e6f72d9 Mon Sep 17 00:00:00 2001 From: Tomasz Chabora Date: Thu, 23 Jul 2020 18:38:32 +0200 Subject: [PATCH] Fix run project when current scene was never saved (cherry picked from commit 9c84e34fd444e0101a4169cadae46c1d28f6dc5f) --- editor/editor_node.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index e3d923dd5e7..d7dc4aa042e 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -2086,8 +2086,7 @@ void EditorNode::_run(bool p_current, const String &p_custom) { String args; bool skip_breakpoints; - if (p_current || (editor_data.get_edited_scene_root() && p_custom == editor_data.get_edited_scene_root()->get_filename())) { - + if (p_current || (editor_data.get_edited_scene_root() && p_custom != String() && p_custom == editor_data.get_edited_scene_root()->get_filename())) { Node *scene = editor_data.get_edited_scene_root(); if (!scene) { @@ -2120,14 +2119,7 @@ void EditorNode::_run(bool p_current, const String &p_custom) { Node *scene = editor_data.get_edited_scene_root(); - if (scene) { //only autosave if there is a scene obviously - - if (scene->get_filename() == "") { - - show_accept(TTR("Current scene was never saved, please save it prior to running."), TTR("OK")); - return; - } - + if (scene && scene->get_filename() != "") { // Only autosave if there is a scene and if it has a path. _save_scene_with_preview(scene->get_filename()); } }