From 56277af5d19c76f89bae10f586ea3b8a8020a511 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 1 Aug 2018 22:43:20 -0700 Subject: [PATCH] Fix quit error message when another PC started the streaming session --- app/backend/computermanager.h | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/backend/computermanager.h b/app/backend/computermanager.h index 0c824edc..29dbb9cc 100644 --- a/app/backend/computermanager.h +++ b/app/backend/computermanager.h @@ -364,22 +364,20 @@ private: try { if (m_Computer->currentGameId != 0) { http.quitApp(); - - if (http.getCurrentGame(http.getServerInfo()) != 0) { - { - QWriteLocker lock(&m_Computer->lock); - m_Computer->pendingQuit = false; - } - emit quitAppFailed("Unable to quit game that wasn't started by this computer. " - "You must quit the game on the host PC manually or use the device that originally started the game."); - } } } catch (const GfeHttpResponseException& e) { { QWriteLocker lock(&m_Computer->lock); m_Computer->pendingQuit = false; } - emit quitAppFailed(e.toQString()); + if (e.getStatusCode() == 599) { + // 599 is a special code we make a custom message for + emit quitAppFailed("The running game wasn't started by this PC. " + "You must quit the game on the host PC manually or use the device that originally started the game."); + } + else { + emit quitAppFailed(e.toQString()); + } } }