Fix loading save states with bluetooth passthrough #9583
Merged
+3
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
iwubcode
reviewed
Mar 14, 2021
Source/Core/Core/HW/Wiimote.cpp
Outdated
| return; | ||
| if (s_wiimote_sources[index] == WiimoteSource::Real) | ||
| { | ||
| const auto bluetooth = std::static_pointer_cast<IOS::HLE::BluetoothRealDevice>( |
There was a problem hiding this comment.
This branch seems unnecessary in its current state...it's accessing the bluetooth and doing nothing with it.
Suggest fixing it (not sure what the correct solution would be) or just removing it if there's nothing to do:
if (s_wiimote_sources[index] == WiimoteSource::Emulated)
{
const auto bluetooth = std::static_pointer_cast<IOS::HLE::BluetoothEmuDevice>(
ios->GetDeviceByName("/dev/usb/oh1/57e/305"));
if (!bluetooth)
return;
bluetooth->AccessWiimoteByIndex(index)->SetSource(GetHIDWiimoteSource(index));
}
|
Thanks for the quick reply. I fixed it. |
leoetlino
requested changes
Mar 14, 2021
When a save state is loaded, the IOS device serving bluetooth is cast as BluetoothEmuDevice. If, however, a real Wiimote with BT passthrough is used, this caused the game to crash. Now the proper device class is used.
leoetlino
approved these changes
Mar 16, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
When a save state is loaded, the IOS device serving bluetooth is cast as BluetoothEmuDevice. If, however, a real Wiimote with BT passthrough is used, this caused the game to crash. Now the proper device class is used.