diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-19 09:58:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-19 09:58:06 +0200 |
| commit | 1f91c2908e7c551c20dc00d88212e0aaad44f4cf (patch) | |
| tree | 127cd16898be268b3a7379e5208c7c6a99783b99 /main/main.cpp | |
| parent | d4c73ea2b379835e75e02b78073547960cf03a74 (diff) | |
| parent | 5a2500f580025f474a12f0c6afd5129e23a50b14 (diff) | |
Merge pull request #9698 from GodotExplorer/pr-fix-config
Fix errors with global config names no more sorrys please
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp index ece54e7427..94544a0cde 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -679,7 +679,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph #ifdef TOOLS_ENABLED - if (main_args.size() == 0 && (!GlobalConfig::get_singleton()->has("application/run/main_loop_type")) && (!GlobalConfig::get_singleton()->has("application/main_scene") || String(GlobalConfig::get_singleton()->get("application/main_scene")) == "")) + if (main_args.size() == 0 && (!GlobalConfig::get_singleton()->has("application/run/main_loop_type")) && (!GlobalConfig::get_singleton()->has("application/run/main_scene") || String(GlobalConfig::get_singleton()->get("application/run/main_scene")) == "")) use_custom_res = false; //project manager (run without arguments) #endif |