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

Qt: Fix e-Reader scanning function reentry (fixes #2693)

This commit is contained in:
Vicki Pfau 2022-10-16 22:14:46 -07:00
parent 2cea9e6d70
commit 153efa253c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -5,6 +5,7 @@ Features:
Other fixes: 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)
- 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)
Misc: Misc:
- GB Serialize: Add missing savestate support for MBC6 and NT (newer) - GB Serialize: Add missing savestate support for MBC6 and NT (newer)

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

@ -914,7 +914,10 @@ void CoreController::scanCard(const QString& path) {
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
return; return;
} }
m_eReaderData = file.read(2912); QByteArray eReaderData = file.read(2912);
if (eReaderData.isEmpty()) {
return;
}
file.seek(0); file.seek(0);
QStringList lines; QStringList lines;
@ -936,6 +939,7 @@ void CoreController::scanCard(const QString& path) {
} }
} }
scanCards(lines); scanCards(lines);
m_eReaderData = eReaderData;
} else if (image.size() == QSize(989, 44) || image.size() == QSize(639, 44)) { } else if (image.size() == QSize(989, 44) || image.size() == QSize(639, 44)) {
const uchar* bits = image.constBits(); const uchar* bits = image.constBits();
size_t size; size_t size;