moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-03 00:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix certain CLI options not overriding GUI preferences. Fixes #435

Browse Source
This commit is contained in:
Cameron Gutman 2020-08-30 01:38:26 -07:00
parent a8be299bbd
commit 14ccc38f4c
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/streaming/session.cpp
View File

@ -941,8 +941,6 @@ private:
// Called in a non-main thread // Called in a non-main thread
bool Session::startConnectionAsync() bool Session::startConnectionAsync()
{ {
StreamingPreferences prefs;
// Wait 1.5 seconds before connecting to let the user // Wait 1.5 seconds before connecting to let the user
// have time to read any messages present on the segue // have time to read any messages present on the segue
SDL_Delay(1500); SDL_Delay(1500);
@ -962,7 +960,7 @@ bool Session::startConnectionAsync()
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Found host supported resolution: %dx%d", "Found host supported resolution: %dx%d",
mode.width, mode.height); mode.width, mode.height);
enableGameOptimizations = prefs.gameOptimizations; enableGameOptimizations = m_Preferences->gameOptimizations;
break; break;
} }
} }
@ -975,7 +973,7 @@ bool Session::startConnectionAsync()
else { else {
http.launchApp(m_App.id, &m_StreamConfig, http.launchApp(m_App.id, &m_StreamConfig,
enableGameOptimizations, enableGameOptimizations,
prefs.playAudioOnHost, m_Preferences->playAudioOnHost,
m_InputHandler->getAttachedGamepadMask()); m_InputHandler->getAttachedGamepadMask());
} }
} catch (const GfeHttpResponseException& e) { } catch (const GfeHttpResponseException& e) {
@ -1064,8 +1062,7 @@ void Session::exec(int displayOriginX, int displayOriginY)
// Initialize the gamepad code with our preferences // Initialize the gamepad code with our preferences
// NB: m_InputHandler must be initialize before starting the connection. // NB: m_InputHandler must be initialize before starting the connection.
StreamingPreferences prefs; m_InputHandler = new SdlInputHandler(*m_Preferences, m_Computer,
m_InputHandler = new SdlInputHandler(prefs, m_Computer,
m_StreamConfig.width, m_StreamConfig.width,
m_StreamConfig.height); m_StreamConfig.height);
@ -1200,7 +1197,7 @@ void Session::exec(int displayOriginX, int displayOriginY)
m_UnexpectedTermination = false; m_UnexpectedTermination = false;
// Start rich presence to indicate we're in game // Start rich presence to indicate we're in game
RichPresenceManager presence(prefs, m_App.name); RichPresenceManager presence(*m_Preferences, m_App.name);
// Hijack this thread to be the SDL main thread. We have to do this // Hijack this thread to be the SDL main thread. We have to do this
// because we want to suspend all Qt processing until the stream is over. // because we want to suspend all Qt processing until the stream is over.