From af43c42c9396bdd5a313de02c8f7f0a4add8d68e Mon Sep 17 00:00:00 2001 From: Doug Binks Date: Sat, 8 Sep 2018 17:14:57 +0200 Subject: [PATCH] Fix for _glfwPlatformGetMonitorWorkarea with NULL inputs. --- src/win32_monitor.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/win32_monitor.c b/src/win32_monitor.c index eacf8a5ad..f5355b285 100644 --- a/src/win32_monitor.c +++ b/src/win32_monitor.c @@ -307,10 +307,14 @@ void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, int* xpos, int* ypos hMonitor = MonitorFromPoint( pointInMonitor, 0 ); GetMonitorInfo(hMonitor, &monitorInfo); - *xpos = monitorInfo.rcWork.left; - *ypos = monitorInfo.rcWork.top; - *width = monitorInfo.rcWork.right - monitorInfo.rcWork.left; - *height = monitorInfo.rcWork.bottom - monitorInfo.rcWork.top; + if (xpos) + *xpos = monitorInfo.rcWork.left; + if (ypos) + *ypos = monitorInfo.rcWork.top; + if (width) + *width = monitorInfo.rcWork.right - monitorInfo.rcWork.left; + if (height) + *height = monitorInfo.rcWork.bottom - monitorInfo.rcWork.top; } GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* count)