ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move Callback Init calls to after load content (fixes Mesen crashing)

This commit is contained in:
Dwedit 2018-04-05 15:33:02 -05:00
parent 9c5a7a7453
commit e42edbf032
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
runahead/secondary_core.c
View File

@ -202,13 +202,6 @@ bool secondary_core_create(void)
if (init_libretro_sym_custom(CORE_TYPE_PLAIN, &secondary_core, secondary_library_path, &secondary_module)) if (init_libretro_sym_custom(CORE_TYPE_PLAIN, &secondary_core, secondary_library_path, &secondary_module))
{ {
secondary_core.symbols_inited = true; secondary_core.symbols_inited = true;
core_set_default_callbacks(&secondary_callbacks);
secondary_core.retro_set_video_refresh(secondary_callbacks.frame_cb);
secondary_core.retro_set_audio_sample(secondary_callbacks.sample_cb);
secondary_core.retro_set_audio_sample_batch(secondary_callbacks.sample_batch_cb);
secondary_core.retro_set_input_state(secondary_callbacks.state_cb);
secondary_core.retro_set_input_poll(secondary_callbacks.poll_cb);
secondary_core.retro_set_environment(rarch_environment_secondary_core_hook); secondary_core.retro_set_environment(rarch_environment_secondary_core_hook);
secondary_core_set_variable_update(); secondary_core_set_variable_update();
@ -267,6 +260,13 @@ bool secondary_core_create(void)
secondary_core.retro_set_controller_port_device(port, device); secondary_core.retro_set_controller_port_device(port, device);
} }
clear_controller_port_map(); clear_controller_port_map();
core_set_default_callbacks(&secondary_callbacks);
secondary_core.retro_set_video_refresh(secondary_callbacks.frame_cb);
secondary_core.retro_set_audio_sample(secondary_callbacks.sample_cb);
secondary_core.retro_set_audio_sample_batch(secondary_callbacks.sample_batch_cb);
secondary_core.retro_set_input_state(secondary_callbacks.state_cb);
secondary_core.retro_set_input_poll(secondary_callbacks.poll_cb);
} }
else else
return false; return false;