DSPHLE: Don't restore the last UCode when the crc doesn't match #9608
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
|
@dolphin-emu-bot rebuild |
leoetlino
reviewed
Mar 26, 2021
| @@ -79,9 +79,10 @@ void DSPHLE::SwapUCode(u32 crc) | |||
| { | |||
| m_mail_handler.Clear(); | |||
|
|
|||
| if (m_last_ucode == nullptr) | |||
| if (!m_last_ucode || UCodeInterface::GetCRC(m_last_ucode.get()) != crc) | |||
There was a problem hiding this comment.
For clarity, maybe invert the conditional to avoid the extra negations
Suggested change
| if (!m_last_ucode || UCodeInterface::GetCRC(m_last_ucode.get()) != crc) | |
| if (m_last_ucode && UCodeInterface::GetCRC(m_last_ucode.get()) == crc) | |
| { | |
| m_ucode = std::move(m_last_ucode); | |
| } | |
| ... |
leoetlino
approved these changes
Mar 26, 2021
shuffle2
reviewed
Mar 27, 2021
| @@ -79,15 +79,16 @@ void DSPHLE::SwapUCode(u32 crc) | |||
| { | |||
There was a problem hiding this comment.
as the comment above states, this was always kinda hacky. Now the behavior doesn't really match the comment, either. Maybe a list should be kept (instead of implicit 2-entry list)?
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.
This performs a sanity check in case that assumption proves to be wrong, which can happen when connecting multiple GBAs simultaneously