From 8d8c6ccf392de8a323c596b96a722e9eeed41f64 Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Wed, 22 Jun 2022 01:11:57 +0100 Subject: [PATCH] fix bad resolutions being picked in windowed mode (#1513) fix bad resolutions being picked in windowed --- game/graphics/pipelines/opengl.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/game/graphics/pipelines/opengl.cpp b/game/graphics/pipelines/opengl.cpp index d532e6536d..04e551236a 100644 --- a/game/graphics/pipelines/opengl.cpp +++ b/game/graphics/pipelines/opengl.cpp @@ -412,13 +412,15 @@ GfxDisplayMode GLDisplay::get_fullscreen() { void GLDisplay::get_screen_size(int vmode_idx, s32* w_out, s32* h_out, s32* count_out) { int count = 0; auto vmode = glfwGetVideoMode(glfwGetPrimaryMonitor()); - auto vmodes = glfwGetVideoModes(glfwGetPrimaryMonitor(), &count); - if (vmode_idx >= 0) { - vmode = &vmodes[vmode_idx]; - } else { - for (int i = 0; i < count; ++i) { - if (!vmode || vmode->height < vmodes[i].height) { - vmode = &vmodes[i]; + if (get_fullscreen() == GfxDisplayMode::Fullscreen) { + auto vmodes = glfwGetVideoModes(glfwGetPrimaryMonitor(), &count); + if (vmode_idx >= 0) { + vmode = &vmodes[vmode_idx]; + } else { + for (int i = 0; i < count; ++i) { + if (!vmode || vmode->height < vmodes[i].height) { + vmode = &vmodes[i]; + } } } }