From ac8861a429f8de2a18daefd61ad89bf6577ee2a8 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Tue, 12 Apr 2022 22:23:08 -0700 Subject: [PATCH] Qt: Fix crash when clicking past last tile in viewer --- CHANGES | 1 + src/platform/qt/TilePainter.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index f3d139d0d..5a4c39fba 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,7 @@ Other fixes: - FFmpeg: Fix GIF recording (fixes mgba.io/i/2393) - GB, GBA: Save writeback-pending masked saves on unload (fixes mgba.io/i/2396) - mGUI: Fix FPS counter after closing menu + - Qt: Fix crash when clicking past last tile in viewer - VFS: Failed file mapping should return NULL on POSIX Misc: - GB MBC: Filter out MBC errors when cartridge is yanked (fixes mgba.io/i/2488) diff --git a/src/platform/qt/TilePainter.cpp b/src/platform/qt/TilePainter.cpp index 9a1238699..c27ade72e 100644 --- a/src/platform/qt/TilePainter.cpp +++ b/src/platform/qt/TilePainter.cpp @@ -41,7 +41,10 @@ void TilePainter::resizeEvent(QResizeEvent*) { void TilePainter::mousePressEvent(QMouseEvent* event) { int x = event->x() / m_size; int y = event->y() / m_size; - emit indexPressed(y * (width() / m_size) + x); + int index = y * (width() / m_size) + x; + if (index < m_tileCount) { + emit indexPressed(index); + } } void TilePainter::clearTile(int index) {