Merge staging/1.2.0 changes back to master.

This commit is contained in:
Nick Couchman 2020-06-07 07:22:05 -04:00
commit af89f828eb

View File

@ -297,7 +297,7 @@ void guac_rdpsnd_wave_info_handler(guac_rdp_common_svc* svc,
/* Reset audio stream if format has changed */ /* Reset audio stream if format has changed */
if (audio != NULL) { if (audio != NULL) {
if (format < sizeof(rdpsnd->formats)) if (format < GUAC_RDP_MAX_FORMATS)
guac_audio_stream_reset(audio, NULL, guac_audio_stream_reset(audio, NULL,
rdpsnd->formats[format].rate, rdpsnd->formats[format].rate,
rdpsnd->formats[format].channels, rdpsnd->formats[format].channels,