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

Qt: Fix sprite export pausing game indefinitely (fixes #841)

This commit is contained in:
Vicki Pfau 2017-08-05 06:56:47 -07:00
parent ffa7e9b8d2
commit d7fc09768d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -27,6 +27,7 @@ Bugfixes:
- Qt: Fix GL display when loading a game from CLI (fixes mgba.io/i/843) - Qt: Fix GL display when loading a game from CLI (fixes mgba.io/i/843)
- GB, GBA Savedata: Fix savestate-related save overwriting (fixes mgba.io/i/834) - GB, GBA Savedata: Fix savestate-related save overwriting (fixes mgba.io/i/834)
- Qt: Fix timezone issues with time overrides - Qt: Fix timezone issues with time overrides
- Qt: Fix sprite export pausing game indefinitely (fixes mgba.io/i/841)
Misc: Misc:
- GBA Timer: Use global cycles for timers - GBA Timer: Use global cycles for timers
- GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722) - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)

2
src/platform/qt/ObjView.cpp
View File

@ -248,7 +248,6 @@ void ObjView::updateTilesGB(bool force) {
#ifdef USE_PNG #ifdef USE_PNG
void ObjView::exportObj() { void ObjView::exportObj() {
CoreController::Interrupter interrupter(m_controller);
QString filename = GBAApp::app()->getSaveFileName(this, tr("Export sprite"), QString filename = GBAApp::app()->getSaveFileName(this, tr("Export sprite"),
tr("Portable Network Graphics (*.png)")); tr("Portable Network Graphics (*.png)"));
VFile* vf = VFileDevice::open(filename, O_WRONLY | O_CREAT | O_TRUNC); VFile* vf = VFileDevice::open(filename, O_WRONLY | O_CREAT | O_TRUNC);
@ -257,6 +256,7 @@ void ObjView::exportObj() {
return; return;
} }
CoreController::Interrupter interrupter(m_controller);
mTileCacheSetPalette(m_tileCache, m_objInfo.paletteSet); mTileCacheSetPalette(m_tileCache, m_objInfo.paletteSet);
png_structp png = PNGWriteOpen(vf); png_structp png = PNGWriteOpen(vf);
png_infop info = PNGWriteHeader8(png, m_objInfo.width * 8, m_objInfo.height * 8); png_infop info = PNGWriteHeader8(png, m_objInfo.width * 8, m_objInfo.height * 8);