Merge pull request #3722 from GregorR/netplay-savestate-task

Reimplemented savestate task informing Netplay
This commit is contained in:
Twinaphex 2016-10-03 16:11:25 +02:00 committed by GitHub
commit faba2bfe0b

View File

@ -38,6 +38,10 @@
#include "../core.h"
#endif
#ifdef HAVE_NETWORKING
#include "network/netplay/netplay.h"
#endif
#include "../core.h"
#include "../file_path_special.h"
#include "../configuration.h"
@ -431,6 +435,12 @@ bool content_undo_load_state(void)
ret = core_unserialize(&serial_info);
#if HAVE_NETWORKING
/* If Netplay is running, inform it */
if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL))
netplay_driver_ctl(RARCH_NETPLAY_CTL_LOAD_SAVESTATE, &serial_info);
#endif
/* Clean up the temporary copy */
free(temp_data);
temp_data = NULL;
@ -878,6 +888,12 @@ static void content_load_state_cb(void *task_data,
ret = core_unserialize(&serial_info);
#if HAVE_NETWORKING
/* If Netplay is running, inform it */
if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL))
netplay_driver_ctl(RARCH_NETPLAY_CTL_LOAD_SAVESTATE, &serial_info);
#endif
/* Flush back. */
for (i = 0; i < num_blocks; i++)
{