From fc460dbb9c6338d3bd68d1e598f1059aeaf41356 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 12 Nov 2021 18:59:29 +0100 Subject: [PATCH] Revert "Fix final warning and remove unused variables" This reverts commit 5dd0e90fca50787ce5010b027642dab3c1f18aef. --- menu/cbs/menu_cbs_ok.c | 2 ++ network/netplay/netplay_frontend.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 419d2c5c4b..b0101901a6 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -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; diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c index df8474e537..ca87b8db4d 100644 --- a/network/netplay/netplay_frontend.c +++ b/network/netplay/netplay_frontend.c @@ -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,