From e467ce7ce89c317d184a1b9c08a72b98b81f3793 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 15 Aug 2018 20:35:11 -0700 Subject: [PATCH] Uninitialize video subsystem before allowing a racing session to start to prevent an assert from firing --- app/streaming/session.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp index 551a5567..aa933db1 100644 --- a/app/streaming/session.cpp +++ b/app/streaming/session.cpp @@ -676,8 +676,8 @@ void Session::exec() if (err != 0) { // We already displayed an error dialog in the stage failure // listener. - s_ActiveSessionSemaphore.release(); SDL_QuitSubSystem(SDL_INIT_VIDEO); + s_ActiveSessionSemaphore.release(); return; } @@ -700,8 +700,8 @@ void Session::exec() SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_CreateWindow() failed: %s", SDL_GetError()); - s_ActiveSessionSemaphore.release(); SDL_QuitSubSystem(SDL_INIT_VIDEO); + s_ActiveSessionSemaphore.release(); return; }