all repos — mgba @ d7fc09768d0c5771f11ad4cf1b40851e7a11a6aa

mGBA Game Boy Advance Emulator

Qt: Fix sprite export pausing game indefinitely (fixes #841)
Vicki Pfau vi@endrift.com
Sat, 05 Aug 2017 06:56:47 -0700
commit

d7fc09768d0c5771f11ad4cf1b40851e7a11a6aa

parent

ffa7e9b8d2bd4a7f30d15bdd4f2f5e14ab6f2787

2 files changed, 2 insertions(+), 1 deletions(-)

jump to
M CHANGESCHANGES

@@ -27,6 +27,7 @@ - GB Serialize: Fix deserializing video STAT

- 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) - Qt: Fix timezone issues with time overrides + - Qt: Fix sprite export pausing game indefinitely (fixes mgba.io/i/841) Misc: - GBA Timer: Use global cycles for timers - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)
M src/platform/qt/ObjView.cppsrc/platform/qt/ObjView.cpp

@@ -248,7 +248,6 @@ #endif

#ifdef USE_PNG void ObjView::exportObj() { - CoreController::Interrupter interrupter(m_controller); QString filename = GBAApp::app()->getSaveFileName(this, tr("Export sprite"), tr("Portable Network Graphics (*.png)")); VFile* vf = VFileDevice::open(filename, O_WRONLY | O_CREAT | O_TRUNC);

@@ -257,6 +256,7 @@ LOG(QT, ERROR) << tr("Failed to open output PNG file: %1").arg(filename);

return; } + CoreController::Interrupter interrupter(m_controller); mTileCacheSetPalette(m_tileCache, m_objInfo.paletteSet); png_structp png = PNGWriteOpen(vf); png_infop info = PNGWriteHeader8(png, m_objInfo.width * 8, m_objInfo.height * 8);