sdlwindow.cpp: close m_thread w/o std::terminate being called

ValveSoftware · May 24, 2024 · 35f5ba8 · 35f5ba8
1 parent 420eb91
commit 35f5ba8
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/sdlwindow.cpp b/src/sdlwindow.cpp
@@ -53,6 +53,7 @@ namespace gamescope
 		GAMESCOPE_SDL_EVENT_CURSOR,
 
 		GAMESCOPE_SDL_EVENT_COUNT,
+		GAMESCOPE_SDL_EVENT_REQ_EXIT,
 	};
 
 	class CSDLConnector final : public IBackendConnector
@@ -111,6 +112,7 @@ namespace gamescope
 	{
 	public:
 		CSDLBackend();
+		~CSDLBackend();
 
 		/////////////
 		// IBackend
@@ -548,7 +550,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" );
@@ -944,6 +951,9 @@ namespace gamescope
 
 						SDL_SetCursor( m_pCursor );
 					}
+					else if ( event.type == GetUserEventIndex( GAMESCOPE_SDL_EVENT_REQ_EXIT ) ) {
+						return;
+					}
 				}
 				break;
 			}