From c58312e2490ef571672b7462b7771d1ebc4c9ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Thu, 8 Jun 2023 03:02:42 +0200 Subject: [PATCH] cogl/onscreen: Add missing error untrap calls Every `mtk_x11_error_trap_push()` must be paired with an `mtk_x11_error_trap_pop[_with_return]()` call otherwise all future errors will be caught and ignored even if they shouldn't be. Part-of: --- cogl/cogl/winsys/cogl-onscreen-glx.c | 1 + cogl/cogl/winsys/cogl-onscreen-xlib.c | 1 + 2 files changed, 2 insertions(+) diff --git a/cogl/cogl/winsys/cogl-onscreen-glx.c b/cogl/cogl/winsys/cogl-onscreen-glx.c index 10642b2a4..7c9b4df64 100644 --- a/cogl/cogl/winsys/cogl-onscreen-glx.c +++ b/cogl/cogl/winsys/cogl-onscreen-glx.c @@ -133,6 +133,7 @@ cogl_onscreen_glx_allocate (CoglFramebuffer *framebuffer, COGL_WINSYS_ERROR_CREATE_ONSCREEN, "Unable to retrieve the X11 visual of context's " "fbconfig"); + mtk_x11_error_trap_pop (xlib_renderer->xdpy); return FALSE; } diff --git a/cogl/cogl/winsys/cogl-onscreen-xlib.c b/cogl/cogl/winsys/cogl-onscreen-xlib.c index 50a320b7c..a0f21ca6a 100644 --- a/cogl/cogl/winsys/cogl-onscreen-xlib.c +++ b/cogl/cogl/winsys/cogl-onscreen-xlib.c @@ -86,6 +86,7 @@ create_xwindow (CoglOnscreenXlib *onscreen_xlib, COGL_WINSYS_ERROR_CREATE_ONSCREEN, "Unable to retrieve the X11 visual of context's " "fbconfig"); + mtk_x11_error_trap_pop (xlib_renderer->xdpy); return None; }