From 5f60c22cfa5c3d62e2cb2f281fd057384fc58f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Wed, 15 Jul 2020 21:56:52 +0200 Subject: [PATCH] Wayland: Fix partial framebuffer size retrieval --- README.md | 1 + src/wl_window.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 17aacf6d..1264aa69 100644 --- a/README.md +++ b/README.md @@ -198,6 +198,7 @@ information on what to include when reporting a bug. - [Wayland] Bugfix: The `GLFW_HAND_CURSOR` shape used the wrong image (#1432) - [Wayland] Bugfix: `CLOCK_MONOTONIC` was not correctly enabled - [Wayland] Bugfix: Repeated keys could be reported with `NULL` window (#1704) + - [Wayland] Bugfix: Retrieving partial framebuffer size would segfault - [POSIX] Bugfix: `CLOCK_MONOTONIC` was not correctly tested for or enabled - [NSGL] Removed enforcement of forward-compatible flag for core contexts - [NSGL] Bugfix: `GLFW_COCOA_RETINA_FRAMEBUFFER` had no effect on newer diff --git a/src/wl_window.c b/src/wl_window.c index 5da645dd..7b315d70 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -955,8 +955,10 @@ void _glfwPlatformGetFramebufferSize(_GLFWwindow* window, int* width, int* height) { _glfwPlatformGetWindowSize(window, width, height); - *width *= window->wl.scale; - *height *= window->wl.scale; + if (width) + *width *= window->wl.scale; + if (height) + *height *= window->wl.scale; } void _glfwPlatformGetWindowFrameSize(_GLFWwindow* window,