diff options
author | Hein-Pieter van Braam <hp@tmm.cx> | 2018-08-12 21:26:08 +0200 |
---|---|---|
committer | Hein-Pieter van Braam <hp@tmm.cx> | 2018-08-14 00:10:20 +0200 |
commit | 321ac5ae136635a12925c97d078153a5cae44f3d (patch) | |
tree | 24adfe812de4b14bac01d6d04566b7e47aeb0531 | |
parent | 15530ce2c51937da9050d6bf3dece34fc9e278cd (diff) |
When starting up try creating directories recursively
Previously we had a check to see if cache and data directories exist and
another check to try to make them if they do not. However the second
check was never reached if we don't have the directories in question.
Furthermore for cache directories on Linux people who never started a
desktop environment we need to recurisively create the XDG directory as
well as the godot specific directory.
This fixes #17963
-rw-r--r-- | editor/editor_settings.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 02e121b5f1..fbea1b6e40 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -755,7 +755,7 @@ void EditorSettings::create() { } if (dir->change_dir(data_dir) != OK) { - dir->make_dir(data_dir); + dir->make_dir_recursive(data_dir); if (dir->change_dir(data_dir) != OK) { ERR_PRINT("Cannot create data directory!"); memdelete(dir); @@ -771,14 +771,8 @@ void EditorSettings::create() { // Validate/create cache dir - if (dir->change_dir(cache_path) != OK) { - ERR_PRINT("Cannot find path for cache directory!"); - memdelete(dir); - goto fail; - } - if (dir->change_dir(cache_dir) != OK) { - dir->make_dir(cache_dir); + dir->make_dir_recursive(cache_dir); if (dir->change_dir(cache_dir) != OK) { ERR_PRINT("Cannot create cache directory!"); memdelete(dir); @@ -788,14 +782,8 @@ void EditorSettings::create() { // Validate/create config dir and subdirectories - if (dir->change_dir(config_path) != OK) { - ERR_PRINT("Cannot find path for config directory!"); - memdelete(dir); - goto fail; - } - if (dir->change_dir(config_dir) != OK) { - dir->make_dir(config_dir); + dir->make_dir_recursive(config_dir); if (dir->change_dir(config_dir) != OK) { ERR_PRINT("Cannot create config directory!"); memdelete(dir); |