core: Get rid of useless settings copy
This commit is contained in:
parent
0540e189b1
commit
68a9408249
@ -178,17 +178,6 @@ BOOL rdp_client_connect(rdpRdp* rdp)
|
||||
BOOL status;
|
||||
rdpSettings* settings = rdp->settings;
|
||||
|
||||
if (rdp->settingsCopy)
|
||||
{
|
||||
freerdp_settings_free(rdp->settingsCopy);
|
||||
rdp->settingsCopy = NULL;
|
||||
}
|
||||
|
||||
rdp->settingsCopy = freerdp_settings_clone(settings);
|
||||
|
||||
if (!rdp->settingsCopy)
|
||||
return FALSE;
|
||||
|
||||
nego_init(rdp->nego);
|
||||
nego_set_target(rdp->nego, settings->ServerHostname, settings->ServerPort);
|
||||
|
||||
@ -313,12 +302,6 @@ BOOL rdp_client_disconnect(rdpRdp* rdp)
|
||||
{
|
||||
BOOL status;
|
||||
|
||||
if (rdp->settingsCopy)
|
||||
{
|
||||
freerdp_settings_free(rdp->settingsCopy);
|
||||
rdp->settingsCopy = NULL;
|
||||
}
|
||||
|
||||
status = nego_disconnect(rdp->nego);
|
||||
|
||||
rdp_reset(rdp);
|
||||
|
@ -1694,7 +1694,6 @@ void rdp_free(rdpRdp* rdp)
|
||||
winpr_Cipher_Free(rdp->fips_encrypt);
|
||||
winpr_Cipher_Free(rdp->fips_decrypt);
|
||||
freerdp_settings_free(rdp->settings);
|
||||
freerdp_settings_free(rdp->settingsCopy);
|
||||
transport_free(rdp->transport);
|
||||
license_free(rdp->license);
|
||||
input_free(rdp->input);
|
||||
|
@ -175,7 +175,6 @@ struct rdp_rdp
|
||||
BOOL resendFocus;
|
||||
BOOL deactivation_reactivation;
|
||||
BOOL AwaitCapabilities;
|
||||
rdpSettings* settingsCopy;
|
||||
};
|
||||
|
||||
FREERDP_LOCAL BOOL rdp_read_security_header(wStream* s, UINT16* flags);
|
||||
|
Loading…
Reference in New Issue
Block a user