From ddb31e9c5abe1fb91bda5e5fee1be4d813d92674 Mon Sep 17 00:00:00 2001 From: Poommetee Ketson Date: Sun, 11 Mar 2018 21:33:21 +0700 Subject: [PATCH] EditorNode: fix clicking ok keeps trying to save (cherry picked from commit e12e6cacdb823caf4227f63f4bd175a593918813) --- editor/editor_node.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index dcd6952539b..497de36bc79 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -589,6 +589,7 @@ void EditorNode::save_resource_in_path(const Ref &p_resource, const St Error err = ResourceSaver::save(path, p_resource, flg | ResourceSaver::FLAG_REPLACE_SUBRESOURCE_PATHS); if (err != OK) { + current_option = -1; accept->set_text(TTR("Error saving resource!")); accept->popup_centered_minsize(); return; @@ -1186,6 +1187,7 @@ void EditorNode::_dialog_action(String p_file) { Error err = ResourceSaver::save(p_file, ml); if (err) { + current_option = -1; accept->get_ok()->set_text(TTR("I see..")); accept->set_text(TTR("Error saving MeshLibrary!")); accept->popup_centered_minsize(); @@ -1220,6 +1222,7 @@ void EditorNode::_dialog_action(String p_file) { Error err = ResourceSaver::save(p_file, ml); if (err) { + current_option = -1; accept->get_ok()->set_text(TTR("I see..")); accept->set_text(TTR("Error saving TileSet!")); accept->popup_centered_minsize();