Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config: Port BluetoothPassthrough settings to new config system. #10326

Merged
merged 1 commit into from Dec 30, 2021

Conversation

AdmiralCurtiss
Copy link
Contributor

This one is untested because I don't have a bluetooth adapter handy at the moment. Someone should test if it still works as expected.

@@ -556,7 +558,7 @@ void BluetoothRealDevice::SaveLinkKeys()
std::string config_string = oss.str();
if (!config_string.empty())
config_string.pop_back();
SConfig::GetInstance().m_bt_passthrough_link_keys = config_string;
Config::SetBase(Config::MAIN_BLUETOOTHPASSTHROUGH_LINK_KEYS, config_string);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is SetBase() fine here or should this be SetBaseOrCurrent()? I can't really imagine a case where this is overridden by anything, but...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SetBase sounds fine to me. We always want this to be persisted.

Source/Core/Core/Config/MainSettings.cpp Outdated Show resolved Hide resolved
@@ -556,7 +558,7 @@ void BluetoothRealDevice::SaveLinkKeys()
std::string config_string = oss.str();
if (!config_string.empty())
config_string.pop_back();
SConfig::GetInstance().m_bt_passthrough_link_keys = config_string;
Config::SetBase(Config::MAIN_BLUETOOTHPASSTHROUGH_LINK_KEYS, config_string);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SetBase sounds fine to me. We always want this to be persisted.

@JMC47 JMC47 merged commit 1af0c5f into dolphin-emu:master Dec 30, 2021
10 checks passed
@AdmiralCurtiss AdmiralCurtiss deleted the config-port-bluetooth branch December 30, 2021 22:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants