From 17e5b6a4553bd459ee5295585adb295cb72d65d8 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Mon, 25 Sep 2017 00:12:20 -0700 Subject: [PATCH] Qt: Fix fast forward crashing when no game loaded --- src/platform/qt/Window.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 1b6232a00..5c40ef52d 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -1167,9 +1167,13 @@ void Window::setupMenu(QMenuBar* menubar) { emulationMenu->addSeparator(); m_shortcutController->addFunctions(emulationMenu, [this]() { - m_controller->setFastForward(true); + if (m_controller) { + m_controller->setFastForward(true); + } }, [this]() { - m_controller->setFastForward(false); + if (m_controller) { + m_controller->setFastForward(false); + } }, QKeySequence(Qt::Key_Tab), tr("Fast forward (held)"), "holdFastForward"); QAction* turbo = new QAction(tr("&Fast forward"), emulationMenu);