mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent more HAVE_NETWORKING handling errors

Browse Source
This commit is contained in:
twinaphex 2019-03-11 18:04:06 +01:00
parent 6ba6f9e3ec
commit 03ba1153a4
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
command.c
View File

@ -2114,24 +2114,6 @@ TODO: Add a setting for these tweaks */
break; break;
case CMD_EVENT_SEND_DEBUG_INFO: case CMD_EVENT_SEND_DEBUG_INFO:
rarch_send_debug_info(); rarch_send_debug_info();
break;
case CMD_EVENT_NETPLAY_HOST_TOGGLE:
if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) &&
netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_SERVER, NULL))
{
command_event(CMD_EVENT_NETPLAY_DISCONNECT, NULL);
}
else if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) &&
!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_SERVER, NULL) &&
netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_CONNECTED, NULL))
{
command_event(CMD_EVENT_NETPLAY_DISCONNECT, NULL);
}
else
{
command_event(CMD_EVENT_NETPLAY_ENABLE_HOST, NULL);
}
break; break;
case CMD_EVENT_FPS_TOGGLE: case CMD_EVENT_FPS_TOGGLE:
{ {
@ -2735,6 +2717,18 @@ TODO: Add a setting for these tweaks */
break; break;
} }
case CMD_EVENT_NETPLAY_HOST_TOGGLE:
if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) &&
netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_SERVER, NULL))
command_event(CMD_EVENT_NETPLAY_DISCONNECT, NULL);
else if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) &&
!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_SERVER, NULL) &&
netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_CONNECTED, NULL))
command_event(CMD_EVENT_NETPLAY_DISCONNECT, NULL);
else
command_event(CMD_EVENT_NETPLAY_ENABLE_HOST, NULL);
break;
#else #else
case CMD_EVENT_NETPLAY_DEINIT: case CMD_EVENT_NETPLAY_DEINIT:
case CMD_EVENT_NETWORK_DEINIT: case CMD_EVENT_NETWORK_DEINIT:
@ -2743,6 +2737,7 @@ TODO: Add a setting for these tweaks */
case CMD_EVENT_NETPLAY_INIT_DIRECT: case CMD_EVENT_NETPLAY_INIT_DIRECT:
case CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED: case CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED:
case CMD_EVENT_NETPLAY_GAME_WATCH: case CMD_EVENT_NETPLAY_GAME_WATCH:
case CMD_EVENT_NETPLAY_HOST_TOGGLE:
return false; return false;
#endif #endif
case CMD_EVENT_FULLSCREEN_TOGGLE: case CMD_EVENT_FULLSCREEN_TOGGLE: