Revert "Fix final warning and remove unused variables"

This reverts commit 5dd0e90fca.
This commit is contained in:
twinaphex 2021-11-12 18:59:29 +01:00
parent 70ee3fbca7
commit fc460dbb9c
2 changed files with 4 additions and 1 deletions

View File

@ -1069,6 +1069,7 @@ int generic_action_ok_displaylist_push(const char *path,
break;
case ACTION_OK_DL_STREAM_CONFIGFILE:
{
global_t *global = global_get_ptr();
info.type = type;
info.directory_ptr = idx;
info_path = recording_st->config_dir;
@ -1079,6 +1080,7 @@ int generic_action_ok_displaylist_push(const char *path,
case ACTION_OK_DL_RECORD_CONFIGFILE:
filebrowser_clear_type();
{
global_t *global = global_get_ptr();
info.type = type;
info.directory_ptr = idx;
info_path = recording_st->config_dir;

View File

@ -941,6 +941,7 @@ bool netplay_handshake_init(netplay_t *netplay,
uint32_t compression = 0;
struct compression_transcoder *ctrans = NULL;
const char *dmsg = NULL;
net_driver_state_t *net_st = &networking_driver_st;
settings_t *settings = config_get_ptr();
bool extra_notifications = settings->bools.notification_show_netplay_extra;
@ -7602,7 +7603,7 @@ void deinit_netplay(void)
free(net_st->mitm_pending.fds);
net_st->mitm_pending.fds = NULL;
}
if (net_st->mitm_pending.ids[0])
if (net_st->mitm_pending.ids)
{
free(net_st->mitm_pending.ids[0]);
memset(net_st->mitm_pending.ids, 0,