Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Raja 2017-11-28 13:13:05 -05:00
commit da06b86c63

View File

@ -203,8 +203,7 @@ void _glfwPollMonitorsX11(void)
free(disconnected);
}
if (!_glfw.monitorCount)
else
{
const int widthMM = DisplayWidthMM(_glfw.x11.display, _glfw.x11.screen);
const int heightMM = DisplayHeightMM(_glfw.x11.display, _glfw.x11.screen);