core/surface: fixup a few pointer handling edge cases

1 files changed, 4 insertions, 0 deletions

diff --git a/src/managers/PointerManager.cpp b/src/managers/PointerManager.cpp
index a09992a2..a405e2eb 100644
--- a/src/managers/PointerManager.cpp
+++ b/src/managers/PointerManager.cpp
@@ -151,6 +151,8 @@ void CPointerManager::setCursorSurface(SP<CWLSurface> surf, const Vector2D& hots
         currentCursorImage.surface = surf;
         currentCursorImage.scale   = surf->resource()->current.scale;
 
+        surf->resource()->map();
+
         currentCursorImage.destroySurface = surf->events.destroy.registerListener([this](std::any data) { resetCursorImage(); });
         currentCursorImage.commitSurface  = surf->resource()->events.commit.registerListener([this](std::any data) {
             damageIfSoftware();
@@ -222,6 +224,8 @@ void CPointerManager::resetCursorImage(bool apply) {
             currentCursorImage.surface->resource()->leave(m);
         }
 
+        currentCursorImage.surface->resource()->unmap();
+
         currentCursorImage.destroySurface.reset();
         currentCursorImage.commitSurface.reset();
         currentCursorImage.surface.reset();