Merge 1.2.0 changes back to master.

This commit is contained in:
Michael Jumper 2020-05-25 02:43:01 -07:00
commit 029563a4b9

View File

@ -296,12 +296,19 @@ void guac_rdpsnd_wave_info_handler(guac_rdp_common_svc* svc,
rdpsnd->next_pdu_is_wave = TRUE;
/* Reset audio stream if format has changed */
if (audio != NULL)
if (audio != NULL) {
if (format < sizeof(rdpsnd->formats))
guac_audio_stream_reset(audio, NULL,
rdpsnd->formats[format].rate,
rdpsnd->formats[format].channels,
rdpsnd->formats[format].bps);
else
guac_client_log(svc->client, GUAC_LOG_WARNING, "RDP server "
"attempted to specify an invalid audio format. Sound may "
"not work as expected.");
}
}
void guac_rdpsnd_wave_handler(guac_rdp_common_svc* svc,