Merge branch 'master' into 'master'

gdk_x11_display_get_monitor: fix monitor number test logic

See merge request GNOME/gtk!107
This commit is contained in:
Daniel Boles 2018-04-09 17:25:08 +00:00
commit d77ede508c

View File

@ -2951,7 +2951,7 @@ gdk_x11_display_get_monitor (GdkDisplay *display,
{
GdkX11Display *x11_display = GDK_X11_DISPLAY (display);
if (0 <= monitor_num || monitor_num < x11_display->monitors->len)
if (0 <= monitor_num && monitor_num < x11_display->monitors->len)
return (GdkMonitor *)x11_display->monitors->pdata[monitor_num];
return NULL;