From ddf0d76dd6a48ca35e580cda31b2bf4284dab5a3 Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Thu, 19 Sep 2024 13:45:23 +0100
Subject: [PATCH] WaylandResource: Fix deleting resource

`delete this` doesn't work on non-virtual base classes. Derp.

Probably impacts #1520
---
 src/WaylandServer/WaylandResource.h | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/WaylandServer/WaylandResource.h b/src/WaylandServer/WaylandResource.h
index 05b41e5df2..0a5994a0c2 100644
--- a/src/WaylandServer/WaylandResource.h
+++ b/src/WaylandServer/WaylandResource.h
@@ -46,15 +46,6 @@ namespace gamescope::WaylandServer
 		{
 		}
 
-		void OnResourceDestroy()
-		{
-			m_pResource = nullptr;
-			m_pClient = nullptr;
-			m_uVersion = 0;
-
-			delete this;
-		}
-
 		template <typename T>
 		static bool CheckAllocation( const T &object, wl_client *pClient )
 		{
@@ -101,7 +92,7 @@ namespace gamescope::WaylandServer
 			[]( wl_resource *pResource )
 			{
 				T *pObject = CWaylandResource::FromWlResource<T>( pResource );
-				pObject->OnResourceDestroy();
+				delete pObject;
 			});
 
 			return pThing;