Fix coredump(s) at exit

ValveSoftware · Jan 5, 2025 · 5c2ad3f · 5c2ad3f
1 parent f873ec7
commit 5c2ad3f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Backends/SDLBackend.cpp b/src/Backends/SDLBackend.cpp
@@ -55,6 +55,7 @@ namespace gamescope
 		GAMESCOPE_SDL_EVENT_CURSOR,
 
 		GAMESCOPE_SDL_EVENT_COUNT,
+		GAMESCOPE_SDL_EVENT_REQ_EXIT,
 	};
 
 	class CSDLConnector final : public IBackendConnector
@@ -113,6 +114,7 @@ namespace gamescope
 	{
 	public:
 		CSDLBackend();
+		~CSDLBackend();
 
 		/////////////
 		// IBackend
@@ -515,6 +517,12 @@ namespace gamescope
 		// Do nothing.
 	}
 
+	CSDLBackend::~CSDLBackend() 
+	{
+			PushUserEvent(GAMESCOPE_SDL_EVENT_REQ_EXIT);
+			m_SDLThread.join();
+	}
+
 	void CSDLBackend::SDLThreadFunc()
 	{
 		pthread_setname_np( pthread_self(), "gamescope-sdl" );
@@ -912,6 +920,10 @@ namespace gamescope
 
 						SDL_SetCursor( m_pCursor );
 					}
+					else if ( event.type == GetUserEventIndex( GAMESCOPE_SDL_EVENT_REQ_EXIT ) ) 
+					{
+						return;
+					}
 				}
 				break;
 			}

diff --git a/src/backend.cpp b/src/backend.cpp
@@ -27,8 +27,7 @@ namespace gamescope
     {
         if ( s_pBackend )
         {
-            delete s_pBackend;
-            s_pBackend = nullptr;
+            std::destroy_at(s_pBackend);
         }
 
         if ( pBackend )