Merge pull request #2281 from jriwanek-forks/named-initializers-3

Named initializers part 3
This commit is contained in:
Miran Grča
2022-04-12 23:38:32 +02:00
committed by GitHub
87 changed files with 5368 additions and 2452 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;