godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3187 from neikeq/fix_3186 

Fix editor layout saving
This commit is contained in:
Rémi Verschelde 2016-01-06 11:58:03 +01:00
parent 78e5bc8e9a fc17ec04fc
commit 820770e2e0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/editor/editor_node.cpp
View File

@ -1454,8 +1454,13 @@ void EditorNode::_dialog_action(String p_file) {
Ref<ConfigFile> config; Ref<ConfigFile> config;
config.instance(); config.instance();
Error err = config->load(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts.cfg")); Error err = config->load(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts.cfg"));
if (err!=OK && err!=ERR_FILE_NOT_FOUND) {
return; //no config if (err==ERR_CANT_OPEN) {
config.instance(); // new config
} else if (err!=OK) {
confirm_error->set_text("Error trying to save layout!");
confirm_error->popup_centered_minsize();
return;
} }
_save_docks_to_config(config, p_file); _save_docks_to_config(config, p_file);
@ -1480,11 +1485,8 @@ void EditorNode::_dialog_action(String p_file) {
Ref<ConfigFile> config; Ref<ConfigFile> config;
config.instance(); config.instance();
Error err = config->load(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts.cfg")); Error err = config->load(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts.cfg"));
if (err!=OK) {
return; //no config
}
if (!config->has_section(p_file)) { if (err!=OK || !config->has_section(p_file)) {
confirm_error->set_text("Layout name not found!"); confirm_error->set_text("Layout name not found!");
confirm_error->popup_centered_minsize(); confirm_error->popup_centered_minsize();
return; return;