From 51645b585123de193da0360d3a69f767a3c4fa59 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: Mon, 9 Jan 2017 09:53:46 +0000 Subject: [PATCH] GDK W32: Remove unneeded assertion Just set check_for_dpi_awareness = TRUE and eventually it will be handled correctly, even if setDpiAwareFunc() returns E_ACCESSDENIED or shcore functions are NULL. https://bugzilla.gnome.org/show_bug.cgi?id=777031 --- gdk/win32/gdkdisplay-win32.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c index ceec5b302c..4bc88fb1ef 100644 --- a/gdk/win32/gdkdisplay-win32.c +++ b/gdk/win32/gdkdisplay-win32.c @@ -934,13 +934,9 @@ _gdk_win32_enable_hidpi (GdkWin32Display *display) break; } } - - /* Should not get here! */ - if (status == DPI_STATUS_PENDING) + else { - g_assert_not_reached (); - display->dpi_aware_type = PROCESS_DPI_UNAWARE; - status = DPI_STATUS_FAILED; + check_for_dpi_awareness = TRUE; } } else