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.

Sign up for GitHub

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

Savestate crash fix #843

Merged
merged 3 commits into from
Jul 21, 2022
Merged

Savestate crash fix #843

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39cd9c8
Adding missing return statements on successful save/load
lilacLunatic Jul 19, 2022
1604cd3
whitespace
lilacLunatic Jul 19, 2022
b4ba961
Removing redundant break statements
lilacLunatic Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions soh/soh/Enhancements/savestates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,10 +869,12 @@ SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) {
switch (request.type) {
case RequestType::SAVE:
requests.push(request);
return SaveStateReturn::SUCCESS;
break;
Copy link
Contributor

Choose a reason for hiding this comment

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

looks like we can remove all the breaks in this switch/case because every path has a return

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

case RequestType::LOAD:
if (states.contains(request.slot)) {
requests.push(request);
return SaveStateReturn::SUCCESS;
} else {
SPDLOG_ERROR("Invalid SaveState slot: {}", request.type);
SohImGui::overlay->TextDrawNotification(1.0f, true, "state slot %u empty", request.slot);
Expand Down