[Bf-blender-cvs] [50dbedf0d89] master: GHOST/Wayland: add missing call to destroy xdg_output

Campbell Barton noreply at git.blender.org
Wed Jan 4 06:12:45 CET 2023


Commit: 50dbedf0d899378407f52df4c3cd933041914ae9
Author: Campbell Barton
Date:   Wed Jan 4 15:49:12 2023 +1100
Branches: master
https://developer.blender.org/rB50dbedf0d899378407f52df4c3cd933041914ae9

GHOST/Wayland: add missing call to destroy xdg_output

Match logic from SDL.

===================================================================

M	intern/ghost/intern/GHOST_SystemWayland.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp
index efcbc79d5c2..8cd7cde79b9 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.cpp
+++ b/intern/ghost/intern/GHOST_SystemWayland.cpp
@@ -4741,6 +4741,9 @@ static void gwl_registry_wl_output_remove(GWL_Display *display,
   /* While windows & cursors hold references to outputs, there is no need to manually remove
    * these references as the compositor will remove references via #wl_surface_listener.leave. */
   GWL_Output *output = static_cast<GWL_Output *>(user_data);
+  if (output->xdg_output) {
+    zxdg_output_v1_destroy(output->xdg_output);
+  }
   wl_output_destroy(output->wl_output);
   std::vector<GWL_Output *>::iterator iter = std::find(
       display->outputs.begin(), display->outputs.end(), output);



More information about the Bf-blender-cvs mailing list