From 8158a8924d194838d9ba6ee76705118efc2b2f09 Mon Sep 17 00:00:00 2001 From: Neil Horne Date: Sun, 30 Jan 2022 20:06:21 +1100 Subject: [PATCH] fix: Show default names in Companion if switch/source names only spaces (#1524) --- companion/src/firmwares/rawsource.cpp | 4 ++-- companion/src/firmwares/rawswitch.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/companion/src/firmwares/rawsource.cpp b/companion/src/firmwares/rawsource.cpp index b1ad52e30..d987c0c7e 100644 --- a/companion/src/firmwares/rawsource.cpp +++ b/companion/src/firmwares/rawsource.cpp @@ -176,7 +176,7 @@ QString RawSource::toString(const ModelData * model, const GeneralSettings * con else if (isStick(&genAryIdx)) result = QString(generalSettings->stickName[genAryIdx]); } - if (result.isEmpty()) + if (result.trimmed().isEmpty()) result = Boards::getAnalogInputName(board, index); return result; @@ -191,7 +191,7 @@ QString RawSource::toString(const ModelData * model, const GeneralSettings * con case SOURCE_TYPE_SWITCH: if (generalSettings) - result = QString(generalSettings->switchName[index]); + result = QString(generalSettings->switchName[index]).trimmed(); if (result.isEmpty()) result = Boards::getSwitchInfo(board, index).name; return result; diff --git a/companion/src/firmwares/rawswitch.cpp b/companion/src/firmwares/rawswitch.cpp index 5ed4d1c68..0715087ff 100644 --- a/companion/src/firmwares/rawswitch.cpp +++ b/companion/src/firmwares/rawswitch.cpp @@ -75,7 +75,7 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen if (IS_HORUS_OR_TARANIS(board)) { qr = div(index-1, 3); if (generalSettings) - swName = QString(generalSettings->switchName[qr.quot]); + swName = QString(generalSettings->switchName[qr.quot]).trimmed(); if (swName.isEmpty()) swName = Boards::getSwitchInfo(board, qr.quot).name; return swName + directionIndicators.at(qr.rem > -1 && qr.rem < directionIndicators.size() ? qr.rem : 1);