all repos — mgba @ dce3744677eac2ae86092fe6acb3b895077b738e

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

dce3744677eac2ae86092fe6acb3b895077b738e

parent

206b01a2d14c2fa17698befba9eb34a186123f88

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

jump to
M CHANGESCHANGES

@@ -16,6 +16,7 @@ - GB MBC: Fix RTC loading when file size is off

- GB Serialize: Fix deserializing video STAT - 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: - Qt: Don't rebuild library view if style hasn't changed - SDL: Fix 2.0.5 build on macOS under some circumstances
M src/platform/qt/ObjView.cppsrc/platform/qt/ObjView.cpp

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

#ifdef USE_PNG void ObjView::exportObj() { - GameController::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);

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

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