mirror of
https://github.com/libretro/RetroArch
synced 2025-03-17 10:21:26 +00:00
Merge branch 'master' of https://github.com/libretro/RetroArch
This commit is contained in:
commit
3cf6850941
@ -233,6 +233,16 @@ void video_driver_make_current_context(void)
|
||||
driver.video_poke->make_current_context(driver.video_data);
|
||||
}
|
||||
|
||||
bool video_driver_is_alive(void)
|
||||
{
|
||||
/* Possible race issue, return true */
|
||||
if (!driver.video || !driver.video_data)
|
||||
return true;
|
||||
if (!driver.video->alive(driver.video_data))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
static void deinit_video_filter(void)
|
||||
{
|
||||
rarch_softfilter_free(g_extern.filter.filter);
|
||||
|
@ -244,6 +244,8 @@ retro_proc_address_t video_driver_get_proc_address(const char *sym);
|
||||
|
||||
void video_driver_make_current_context(void);
|
||||
|
||||
bool video_driver_is_alive(void);
|
||||
|
||||
void uninit_video_input(void);
|
||||
|
||||
void init_video(void);
|
||||
|
@ -636,7 +636,7 @@ static inline int time_to_exit(retro_input_t input)
|
||||
|| (g_extern.max_frames && g_extern.frame_count >=
|
||||
g_extern.max_frames)
|
||||
|| (g_extern.bsv.movie_end && g_extern.bsv.eof_exit)
|
||||
|| !driver.video->alive(driver.video_data)
|
||||
|| !video_driver_is_alive()
|
||||
)
|
||||
return 1;
|
||||
return 0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user