diff options
| author | Rémi Verschelde | 2017-04-23 10:32:52 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2017-04-23 11:17:32 +0200 |
| commit | 515f92d03b6bb4e8a42d5b88d603c96c69d233a4 (patch) | |
| tree | ca6fbc8aa59e0e25d1ca5cf31f090f0f6bcde9ee /main/main.cpp | |
| parent | b474646de081084dd691648f87d6057b77fbd819 (diff) | |
| download | godot-515f92d03b6bb4e8a42d5b88d603c96c69d233a4.tar.gz godot-515f92d03b6bb4e8a42d5b88d603c96c69d233a4.tar.zst godot-515f92d03b6bb4e8a42d5b88d603c96c69d233a4.zip | |
Fix property warnings and hide some debug prints
"ALL IS GOOD" was a lie.
In particular, removes verbose "path not recognized" false positive.
The actual logic is to (somewhat naively) check all ResourceFormatLoaders
and to pick the first good match, so no need to warn about the formats
that do not match the type hint.
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 c29492604..377d15f5f 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -697,7 +697,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph video_mode.width = globals->get("display/window/width"); if (!force_res && use_custom_res && globals->has("display/window/height")) video_mode.height = globals->get("display/window/height"); - if (!editor && (!bool(globals->get("display/window/allow_hidpi")) || force_lowdpi)) { + if (!editor && ((globals->has("display/window/allow_hidpi") && !globals->get("display/window/allow_hidpi")) || force_lowdpi)) { OS::get_singleton()->_allow_hidpi = false; } if (use_custom_res && globals->has("display/window/fullscreen")) |