ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Don't re-enable sync if GBA link modes aren't the same (fixes #2044)

This commit is contained in:
Vicki Pfau 2022-11-27 20:08:20 -08:00
parent c511d53d59
commit 9b2d4bc68e
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -11,6 +11,7 @@ Other fixes:
- Qt: Manually split filename to avoid overzealous splitting (fixes mgba.io/i/2681) - Qt: Manually split filename to avoid overzealous splitting (fixes mgba.io/i/2681)
- Qt: Expand criteria for tag branch names (fixes mgba.io/i/2679) - Qt: Expand criteria for tag branch names (fixes mgba.io/i/2679)
- Qt: Fix scanning specific e-Reader dotcodes (fixes mgba.io/i/2693) - Qt: Fix scanning specific e-Reader dotcodes (fixes mgba.io/i/2693)
- Qt: Don't re-enable sync if GBA link modes aren't the same (fixes mgba.io/i/2044)
- Res: Fix species name location in Ruby/Sapphire revs 1/2 (fixes mgba.io/i/2685) - Res: Fix species name location in Ruby/Sapphire revs 1/2 (fixes mgba.io/i/2685)
- VFS: Fix minizip write returning 0 on success instead of size - VFS: Fix minizip write returning 0 on success instead of size
Misc: Misc:

6
src/platform/qt/MultiplayerController.cpp
View File

@ -75,12 +75,6 @@ MultiplayerController::MultiplayerController() {
if (!id) { if (!id) {
for (int i = 1; i < controller->m_players.count(); ++i) { for (int i = 1; i < controller->m_players.count(); ++i) {
Player* player = &controller->m_players[i]; Player* player = &controller->m_players[i];
#ifdef M_CORE_GBA
if (player->controller->platform() == mPLATFORM_GBA && player->gbaNode->d.p->mode != controller->m_players[0].gbaNode->d.p->mode) {
player->controller->setSync(true);
continue;
}
#endif
player->controller->setSync(false); player->controller->setSync(false);
player->cyclesPosted += cycles; player->cyclesPosted += cycles;
if (player->awake < 1) { if (player->awake < 1) {