Fixed memory leak in xdpy_set_system_mouse_cursor()

liballeg · Dec 28, 2024 · 4048fe0 · 4048fe0
1 parent da53331
commit 4048fe0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/x/xcursor.c b/src/x/xcursor.c
@@ -123,14 +123,18 @@ static bool xdpy_set_mouse_cursor(ALLEGRO_DISPLAY *display,
    Display *xdisplay = system->x11display;
    Window xwindow = glx->window;
 
+   _al_mutex_lock(&system->lock);
+   if (glx->is_system_cursor && glx->current_cursor) {
+      XFreeCursor(xdisplay, glx->current_cursor);
+   }
+
    glx->current_cursor = xcursor->cursor;
    glx->is_system_cursor = false;
 
    if (!glx->cursor_hidden) {
-      _al_mutex_lock(&system->lock);
       XDefineCursor(xdisplay, xwindow, glx->current_cursor);
-      _al_mutex_unlock(&system->lock);
    }
+   _al_mutex_unlock(&system->lock);
 
    return true;
 }