Backport several changes from M&K

This commit is contained in:
Jasmine Iwanek
2022-03-25 19:42:43 -04:00
parent 7d15a75cf4
commit 702f80e58a
9 changed files with 737 additions and 519 deletions

View File

@@ -130,7 +130,7 @@ void DeviceConfig::ConfigureDevice(const _device_* device, int instance, Setting
break;
}
for (auto* sel = config->selection; (sel->description != nullptr) && (strlen(sel->description) > 0); ++sel) {
for (auto* sel = config->selection; (sel != nullptr) && (sel->description != nullptr) && (strlen(sel->description) > 0); ++sel) {
int row = Models::AddEntry(model, sel->description, sel->value);
if (selected == sel->value) {
currentIndex = row;