diff --git a/CHANGES b/CHANGES index 19b276359..f2637d39d 100644 --- a/CHANGES +++ b/CHANGES @@ -37,6 +37,7 @@ Bugfixes: - GBA Audio: Properly initialize audio FIFO channels - Util: Fix SOCKET_FAILED macro - GBA: Fix timers 2 and 3 updating incorrectly + - Qt: Fix crash if a game pauses before any frames are shown Misc: - Qt: Disable sync to video by default - GBA: Exit cleanly on FATAL if the port supports it diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index ce86ce5a7..81ff41d2e 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -363,11 +363,15 @@ void Window::recordFrame() { } void Window::showFPS() { + char title[13] = { '\0' }; + GBAGetGameTitle(m_controller->thread()->gba, title); + if (m_frameList.isEmpty()) { + setWindowTitle(tr(PROJECT_NAME " - %1").arg(title)); + return; + } qint64 interval = m_frameList.first().msecsTo(m_frameList.last()); float fps = (m_frameList.count() - 1) * 10000.f / interval; fps = round(fps) / 10.f; - char title[13] = { '\0' }; - GBAGetGameTitle(m_controller->thread()->gba, title); setWindowTitle(tr(PROJECT_NAME " - %1 (%2 fps)").arg(title).arg(fps)); }