summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2021-06-09 10:47:32 +0200
committerRémi Verschelde <rverschelde@gmail.com>2021-06-14 19:56:20 +0200
commit1074017f043ec9155b12ea97cd00cf11361ccdf0 (patch)
treed286027835b2e02b89782b4f9a31a407d6b5651f /main
parent16027e7cf412140c128e7c002ce0be533b94db00 (diff)
Refactor editor paths validation in EditorPaths and EditorSettings
- EditorSettings: Ensure that `create()` makes a valid singleton. Fixes #49179, fixes #49450. - EditorPaths: Cleanup code, properly set `paths_valid`. - EditorPaths: Move more paths validation (check, mkdir) from EditorSettings for a better separation of concerns. - EditorPaths: Move EditorFileSystem creation of `.godot/imported` next to other paths.
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 13a9986564..7d4e4ef372 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1453,7 +1453,7 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
#ifdef TOOLS_ENABLED
if (editor || project_manager) {
- EditorNode::register_editor_paths(project_manager);
+ EditorPaths::create();
}
#endif
@@ -2379,10 +2379,8 @@ bool Main::start() {
}
// Load SSL Certificates from Editor Settings (or builtin)
- Crypto::load_default_certificates(EditorSettings::get_singleton()->get_setting(
- "network/ssl/editor_ssl_certificates")
- .
- operator String());
+ Crypto::load_default_certificates(
+ EditorSettings::get_singleton()->get_setting("network/ssl/editor_ssl_certificates").operator String());
}
#endif
}