summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/main.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/main/main.cpp b/main/main.cpp
index ae03dd527a..46b5909ce7 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1026,13 +1026,11 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
goto error;
}
} else if (I->get() == "-f" || I->get() == "--fullscreen") { // force fullscreen
-
init_fullscreen = true;
+ window_mode = DisplayServer::WINDOW_MODE_FULLSCREEN;
} else if (I->get() == "-m" || I->get() == "--maximized") { // force maximized window
-
init_maximized = true;
window_mode = DisplayServer::WINDOW_MODE_MAXIMIZED;
-
} else if (I->get() == "-w" || I->get() == "--windowed") { // force windowed window
init_windowed = true;
@@ -1645,7 +1643,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
if (editor) {
packed_data->set_disabled(true);
main_args.push_back("--editor");
- if (!init_windowed) {
+ if (!init_windowed && !init_fullscreen) {
init_maximized = true;
window_mode = DisplayServer::WINDOW_MODE_MAXIMIZED;
}