diff --git a/retroarch.c b/retroarch.c index 9fe5611a4b..a67947d0f6 100644 --- a/retroarch.c +++ b/retroarch.c @@ -4048,8 +4048,17 @@ static enum runloop_state runloop_check_state( /* Display the fast forward state to the user, if needed. */ if (runloop_fastmotion) - runloop_msg_queue_push( - msg_hash_to_str(MSG_FAST_FORWARD), 1, 1, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); + { +#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS) + if (!video_driver_has_widgets() || !menu_widgets_set_fast_forward(true)) +#endif + runloop_msg_queue_push( + msg_hash_to_str(MSG_FAST_FORWARD), 1, 1, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); + } +#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS) + else + menu_widgets_set_fast_forward(false); +#endif old_button_state = new_button_state; old_hold_button_state = new_hold_button_state;