From 2c0987555662a5015920cb252b7d34bbfa32c401 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 16 Feb 2019 01:39:31 -0800
Subject: [PATCH] Fix input handler cleanup on startup failure

---
 app/streaming/session.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp
index bdc91eb7..05ef0848 100644
--- a/app/streaming/session.cpp
+++ b/app/streaming/session.cpp
@@ -862,10 +862,14 @@ void Session::exec(int displayOriginX, int displayOriginY)
                            m_InputHandler->getAttachedGamepadMask());
         }
     } catch (const GfeHttpResponseException& e) {
+        delete m_InputHandler;
+        m_InputHandler = nullptr;
         emit displayLaunchError(e.toQString());
         QThreadPool::globalInstance()->start(new DeferredSessionCleanupTask(this));
         return;
     } catch (const QtNetworkReplyException& e) {
+        delete m_InputHandler;
+        m_InputHandler = nullptr;
         emit displayLaunchError(e.toQString());
         QThreadPool::globalInstance()->start(new DeferredSessionCleanupTask(this));
         return;
@@ -876,6 +880,8 @@ void Session::exec(int displayOriginX, int displayOriginY)
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
                      SDL_GetError());
+        delete m_InputHandler;
+        m_InputHandler = nullptr;
         emit displayLaunchError(QString::fromLocal8Bit(SDL_GetError()));
         QThreadPool::globalInstance()->start(new DeferredSessionCleanupTask(this));
         return;
@@ -904,6 +910,8 @@ void Session::exec(int displayOriginX, int displayOriginY)
     if (err != 0) {
         // We already displayed an error dialog in the stage failure
         // listener.
+        delete m_InputHandler;
+        m_InputHandler = nullptr;
         SDL_QuitSubSystem(SDL_INIT_VIDEO);
         QThreadPool::globalInstance()->start(new DeferredSessionCleanupTask(this));
         return;
@@ -926,6 +934,8 @@ void Session::exec(int displayOriginX, int displayOriginY)
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "SDL_CreateWindow() failed: %s",
                      SDL_GetError());
+        delete m_InputHandler;
+        m_InputHandler = nullptr;
         SDL_QuitSubSystem(SDL_INIT_VIDEO);
         QThreadPool::globalInstance()->start(new DeferredSessionCleanupTask(this));
         return;