diff options
| author | Rémi Verschelde | 2017-04-24 11:04:16 +0200 |
|---|---|---|
| committer | GitHub | 2017-04-24 11:04:16 +0200 |
| commit | d7578792ca75571cedbf6f4cf98315ec3141e1b6 (patch) | |
| tree | 3e35f189cac469fb81b7450827c3f7037d12792b /main/main.cpp | |
| parent | 4c147008f33773bb385c6a67b1a7394ddbef6126 (diff) | |
| parent | 515f92d03b6bb4e8a42d5b88d603c96c69d233a4 (diff) | |
| download | godot-d7578792ca75571cedbf6f4cf98315ec3141e1b6.tar.gz godot-d7578792ca75571cedbf6f4cf98315ec3141e1b6.tar.zst godot-d7578792ca75571cedbf6f4cf98315ec3141e1b6.zip | |
Merge pull request #8496 from akien-mga/stdout-cleanup
Fix property warnings and hide some debug prints
Diffstat (limited to '')
| -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")) |