always pop GDK errors

Xpra-org · Jul 26, 2022 · 4425c08 · 4425c08
1 parent 10c5980
commit 4425c08
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/xpra/x11/gtk3/gdk_bindings.pyx b/xpra/x11/gtk3/gdk_bindings.pyx
@@ -807,12 +807,14 @@ cdef object _gw(display, Window xwin):
         disp = get_raw_display_for(display)
         gdk_x11_display_error_trap_push(disp)
         try:
+          try:
             win = GdkX11.X11Window.foreign_new_for_display(display, xwin)
-        except TypeError as e:
+          except TypeError as e:
             verbose("cannot get gdk window for %s, %#x: %s", display, xwin, e)
             return None
-        gdk_display_flush(disp)
-        error = gdk_x11_display_error_trap_pop(disp)
+          gdk_display_flush(disp)
+        finally:
+          error = gdk_x11_display_error_trap_pop(disp)
     except Exception as e:
         verbose("cannot get gdk window for %s, %#x: %s", display, xwin, e)
         if disp: