From f7ae36739ad054f029c27d766197d167ea970c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Fri, 20 Jan 2017 09:08:41 +0000 Subject: [PATCH] GDK W32: Fix idiotic gdk_win32_display_get_monitor() implementation Replace the code borrowed from the X11 backend with the code borrowed from Wayland backend. Now GTK doesn't crash when the number of monitors is zero. --- gdk/win32/gdkdisplay-win32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c index 4e11cd81a4..ddc67672cd 100644 --- a/gdk/win32/gdkdisplay-win32.c +++ b/gdk/win32/gdkdisplay-win32.c @@ -1095,10 +1095,10 @@ gdk_win32_display_get_monitor (GdkDisplay *display, { GdkWin32Display *win32_display = GDK_WIN32_DISPLAY (display); - if (0 <= monitor_num || monitor_num < win32_display->monitors->len) - return (GdkMonitor *) g_ptr_array_index (win32_display->monitors, monitor_num); + if (monitor_num < 0 || monitor_num >= win32_display->monitors->len) + return NULL; - return NULL; + return (GdkMonitor *) g_ptr_array_index (win32_display->monitors, monitor_num); } static GdkMonitor *