NetPlayClient: Treat power button event as a netplay stop. #11059
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
|
Since JMC asked: Yes, this still lets games gracefully shutdown, which is needed for some games (like VC games) to write their saves. I've tested this in combination with #11047 on a VC SNES copy of FF6 -- though with two local instances of Dolphin, so without any real network latency. |
iwubcode
reviewed
Sep 17, 2022
| @@ -252,6 +252,8 @@ class NetPlayClient : public TraversalClientClient | |||
| void DisplayPlayersPing(); | |||
| u32 GetPlayersMaxPing() const; | |||
|
|
|||
| bool WaitForWiimoteBuffer(int _number); | |||
There was a problem hiding this comment.
m_wii_pad_event.Wait() is not const.
There was a problem hiding this comment.
Gah, somehow I glossed over that. Sorry!
iwubcode
approved these changes
Sep 17, 2022
|
This seems to work, at least Wii Netplay hasn't crashed for me on LAN testing. Which, it crashes pretty commonly on master. |
|
Well, in that case... |
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.
Sending the power button event over netplay is completely unsynced, which means more likely than not two instances of Dolphin will start the graceful shutdown sequence at different points in time, desyncing in the process. This wouldn't be so bad -- we're shutting down anyway -- except that inputs may still be queried by the game during the shutdown. This can lead to a situation where one instance has fully shut down, but another instance is still waiting for an input.
By stopping Netplay as soon as the power button event is received, we can work around this; that means it won't wait for input that may never come.
@JMC47 Can you test if this fixes known cases of hangs on shutdown, especially when Wiimote disconnects are involved?