From 4571ed24384769370b46acc1abd4313c70bf4f11 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 9 Sep 2015 15:20:43 +0200 Subject: [PATCH] Fixes #2855 - Logical Switches now Test needed please! --- radio/src/audio_arm.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp index af428df71..882a8cf4c 100644 --- a/radio/src/audio_arm.cpp +++ b/radio/src/audio_arm.cpp @@ -333,10 +333,17 @@ void getSwitchAudioFile(char * filename, swsrc_t index) void getLogicalSwitchAudioFile(char * filename, int index, unsigned int event) { char * str = getModelAudioPath(filename); + +#if defined(PCBTARANIS) + *str++ = 'L'; + *str++ = '1'+index; +#else int len = STR_VSWITCHES[0]; strncpy(str, &STR_VSWITCHES[1+len*(index+SWSRC_FIRST_LOGICAL_SWITCH)], len); - str[len] = '\0'; - strcat(str, suffixes[event]); + str += len; +#endif + + strcpy(str, suffixes[event]); strcat(str, SOUNDS_EXT); }