From d98902c21ef4f7feab625fc11b5347faaf648a2f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 3 Aug 2015 20:39:58 +0200 Subject: [PATCH] Don't use video_driver_get_frame_count in crucial runloop function --- runloop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runloop.c b/runloop.c index 91defaaaab..ef9a0ae256 100644 --- a/runloop.c +++ b/runloop.c @@ -612,7 +612,8 @@ static INLINE int time_to_exit(driver_t *driver, global_t *global, bool shutdown_pressed = system && system->shutdown; bool video_alive = video && video->alive(driver->video_data); bool movie_end = (global->bsv.movie_end && global->bsv.eof_exit); - uint64_t frame_count = video_driver_get_frame_count(); + uint64_t frame_count = (driver && driver->video_poke && driver->video_poke->get_frame_count) ? + driver->video_poke->get_frame_count(driver->video_data) : 0; bool frame_count_end = global->max_frames && (frame_count >= global->max_frames); if (shutdown_pressed || cmd->quit_key_pressed || frame_count_end || movie_end