summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-03-13 09:36:55 +0100
committerGitHub <noreply@github.com>2018-03-13 09:36:55 +0100
commit15626fa2d08b8de4b75353a115c724b5b017d8d9 (patch)
treed4078ab7010ce721f4e5a21dae34122c99e52ef1
parent7e246a0cb71bb4f1ac3eff4c5f3de504a35ff992 (diff)
parente12e6cacdb823caf4227f63f4bd175a593918813 (diff)
Merge pull request #17442 from Noshyaar/esr
EditorNode: fix clicking ok keeps trying to save
-rw-r--r--editor/editor_node.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 8132575479..c7d1916b6b 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -597,6 +597,7 @@ void EditorNode::save_resource_in_path(const Ref<Resource> &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;
@@ -1194,6 +1195,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();
@@ -1228,6 +1230,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();