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

Be more strict about init ordering of netplay, movies and states.

This commit is contained in:
Themaister 2012-05-04 00:45:53 +02:00
parent 81c4d29064
commit 1e0ef3d08d
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
retroarch.c
View File

@ -1281,6 +1281,14 @@ static void init_netplay(void)
if (!g_extern.netplay_enable) if (!g_extern.netplay_enable)
return; return;
#ifdef HAVE_BSV_MOVIE
if (g_extern.bsv.movie_start_playback)
{
RARCH_WARN("Movie playback has started. Cannot start netplay.\n");
return;
}
#endif
struct retro_callbacks cbs = {0}; struct retro_callbacks cbs = {0};
cbs.frame_cb = video_frame; cbs.frame_cb = video_frame;
cbs.sample_cb = audio_sample; cbs.sample_cb = audio_sample;
@ -1564,6 +1572,11 @@ static void fill_pathnames(void)
static void load_auto_state(void) static void load_auto_state(void)
{ {
#ifdef HAVE_NETPLAY
if (g_extern.netplay_enable && !g_extern.netplay_is_spectate)
return;
#endif
char savestate_name_auto[PATH_MAX]; char savestate_name_auto[PATH_MAX];
fill_pathname_noext(savestate_name_auto, g_extern.savestate_name, fill_pathname_noext(savestate_name_auto, g_extern.savestate_name,
".auto", sizeof(savestate_name_auto)); ".auto", sizeof(savestate_name_auto));