summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2018-12-25 15:48:08 +0100
committerGitHub <noreply@github.com>2018-12-25 15:48:08 +0100
commitca2a2c98f252d21dc609d26f4264a43ed091b8fe (patch)
treed15cf1341f0116c7db26ba430ce9a9f782938ea0 /Source/Core
parent08ae6d7706fb4b0a8210efaa3452ab05255f3888 (diff)
parentcf8b730c61cbb689b5f0bf01bc6156a6f0544c43 (diff)
Merge pull request #7627 from Techjar/netplay-disable-bt-passthrough
Core/BootManager: Disable bluetooth passthrough when booting NetPlay
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/BootManager.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
index 9e5f205113..644a2d5340 100644
--- a/Source/Core/Core/BootManager.cpp
+++ b/Source/Core/Core/BootManager.cpp
@@ -92,6 +92,7 @@ private:
float m_EmulationSpeed;
float m_OCFactor;
bool m_OCEnable;
+ bool m_bt_passthrough_enabled;
std::string strBackend;
std::string sBackend;
std::string m_strGPUDeterminismMode;
@@ -128,6 +129,7 @@ void ConfigCache::SaveConfig(const SConfig& config)
m_strGPUDeterminismMode = config.m_strGPUDeterminismMode;
m_OCFactor = config.m_OCFactor;
m_OCEnable = config.m_OCEnable;
+ m_bt_passthrough_enabled = config.m_bt_passthrough_enabled;
std::copy(std::begin(g_wiimote_sources), std::end(g_wiimote_sources), std::begin(iWiimoteSource));
std::copy(std::begin(config.m_SIDevice), std::end(config.m_SIDevice), std::begin(Pads));
@@ -203,6 +205,7 @@ void ConfigCache::RestoreConfig(SConfig* config)
config->m_strGPUDeterminismMode = m_strGPUDeterminismMode;
config->m_OCFactor = m_OCFactor;
config->m_OCEnable = m_OCEnable;
+ config->m_bt_passthrough_enabled = m_bt_passthrough_enabled;
VideoBackendBase::ActivateBackend(config->m_strVideoBackend);
}
@@ -372,6 +375,7 @@ bool BootCore(std::unique_ptr<BootParameters> boot, const WindowSystemInfo& wsi)
StartUp.bMMU = netplay_settings.m_MMU;
StartUp.bFastmem = netplay_settings.m_Fastmem;
StartUp.bHLE_BS2 = netplay_settings.m_SkipIPL;
+ StartUp.m_bt_passthrough_enabled = false;
if (netplay_settings.m_HostInputAuthority && !netplay_settings.m_IsHosting)
config_cache.bSetEmulationSpeed = true;
}