Fix some of the indenting; add NULL checks
This commit is contained in:
parent
0194ce91bf
commit
af6b09d950
14
retroarch.c
14
retroarch.c
|
@ -31929,7 +31929,8 @@ void video_driver_build_info(video_frame_info_t *video_info)
|
||||||
video_info->runloop_is_paused = runloop_state.paused;
|
video_info->runloop_is_paused = runloop_state.paused;
|
||||||
video_info->runloop_is_slowmotion = runloop_state.slowmotion;
|
video_info->runloop_is_slowmotion = runloop_state.slowmotion;
|
||||||
|
|
||||||
video_info->input_driver_nonblock_state = input_driver_st->nonblocking_flag;
|
video_info->input_driver_nonblock_state = input_driver_st ?
|
||||||
|
input_driver_st->nonblocking_flag : false;
|
||||||
video_info->input_driver_grab_mouse_state = p_rarch->input_driver_grab_mouse_state;
|
video_info->input_driver_grab_mouse_state = p_rarch->input_driver_grab_mouse_state;
|
||||||
video_info->disp_userdata = &p_rarch->dispgfx;
|
video_info->disp_userdata = &p_rarch->dispgfx;
|
||||||
|
|
||||||
|
@ -32872,9 +32873,12 @@ static void driver_adjust_system_rates(
|
||||||
**/
|
**/
|
||||||
void driver_set_nonblock_state(void)
|
void driver_set_nonblock_state(void)
|
||||||
{
|
{
|
||||||
struct rarch_state *p_rarch = &rarch_st;
|
struct rarch_state
|
||||||
input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
|
*p_rarch = &rarch_st;
|
||||||
bool enable = input_driver_st->nonblocking_flag;
|
input_driver_state_t
|
||||||
|
*input_driver_st = &p_rarch->input_driver_state;
|
||||||
|
bool enable = input_driver_st ?
|
||||||
|
input_driver_st->nonblocking_flag : false;
|
||||||
settings_t *settings = p_rarch->configuration_settings;
|
settings_t *settings = p_rarch->configuration_settings;
|
||||||
bool audio_sync = settings->bools.audio_sync;
|
bool audio_sync = settings->bools.audio_sync;
|
||||||
bool video_vsync = settings->bools.video_vsync;
|
bool video_vsync = settings->bools.video_vsync;
|
||||||
|
@ -38652,7 +38656,7 @@ int runloop_iterate(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((video_frame_delay > 0) && !input_driver_st->nonblocking_flag)
|
if ((video_frame_delay > 0) && input_driver_st && !input_driver_st->nonblocking_flag)
|
||||||
retro_sleep(video_frame_delay);
|
retro_sleep(video_frame_delay);
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue