diff options
| author | Gilles Roudiere <gilles.roudiere@gmail.com> | 2017-12-30 22:18:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 22:18:23 +0900 |
| commit | 0294887a0ca1b42f9fddb3858d4ee304b3f4d055 (patch) | |
| tree | 52141d7cd668aeeffa9cc7f65124d424667cfcff | |
| parent | 9d406889529e480019dbd5b066e2c9c492d2ad97 (diff) | |
| parent | 343497149621433f4acd56b85f576e100790a243 (diff) | |
Merge pull request #15175 from Hinsbart/windowed_editor
Editor: Respect -w command line flag.
| -rw-r--r-- | main/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 5648676c4c..b72ffb9850 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -755,8 +755,10 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph if (editor) { Engine::get_singleton()->set_editor_hint(true); main_args.push_back("--editor"); - init_maximized = true; - video_mode.maximized = true; + if (!init_windowed) { + init_maximized = true; + video_mode.maximized = true; + } use_custom_res = false; } |