waylandResource: remove user data in markDefunct and not ~dtor

This commit is contained in:
vaxerski 2023-09-01 20:02:03 +02:00
parent 8314341ffe
commit 774a5bedf8

View file

@ -31,6 +31,7 @@ void CWaylandResource::markDefunct() {
Debug::log(TRACE, "[wl res %lx] now defunct", m_pWLResource); Debug::log(TRACE, "[wl res %lx] now defunct", m_pWLResource);
m_bDefunct = true; m_bDefunct = true;
wl_resource_set_user_data(m_pWLResource, nullptr);
} }
CWaylandResource::~CWaylandResource() { CWaylandResource::~CWaylandResource() {
@ -39,9 +40,6 @@ CWaylandResource::~CWaylandResource() {
wl_list_remove(&m_liResourceDestroy.link); wl_list_remove(&m_liResourceDestroy.link);
wl_list_init(&m_liResourceDestroy.link); wl_list_init(&m_liResourceDestroy.link);
if (m_pWLResource)
wl_resource_set_user_data(m_pWLResource, nullptr);
Debug::log(TRACE, "[wl res %lx] destroying (wl_resource_destroy will be %s)", m_pWLResource, (DESTROY ? "sent" : "not sent")); Debug::log(TRACE, "[wl res %lx] destroying (wl_resource_destroy will be %s)", m_pWLResource, (DESTROY ? "sent" : "not sent"));
if (DESTROY) if (DESTROY)