mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #12668: Crash opening picker window with filter when no results available. (#12669) 

When first opening the picker window, we attempt to find a valid class and type to select. If the picker window was closed with filters enabled, there may not be anything list that is usable.

Resolve this by using callbacks to find the first usable type when no types are listed.
This commit is contained in:
Peter Nelson 2024-05-12 20:14:29 +01:00 committed by GitHub
parent 77c188e6da
commit f2f7573c3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/picker_gui.cpp
View File

@ -475,8 +475,20 @@ void PickerWindow::EnsureSelectedClassIsValid()
int class_index = this->callbacks.GetSelectedClass();
if (std::binary_search(std::begin(this->classes), std::end(this->classes), class_index)) return;
class_index = this->classes.front();
if (!this->classes.empty()) {
class_index = this->classes.front();
} else {
/* Classes can be empty if filters are enabled, find the first usable class. */
int count = this->callbacks.GetClassCount();
for (int i = 0; i < count; i++) {
if (this->callbacks.GetClassName(i) == INVALID_STRING_ID) continue;
class_index = i;
break;
}
}
this->callbacks.SetSelectedClass(class_index);
this->types.ForceRebuild();
}
void PickerWindow::EnsureSelectedClassIsVisible()
@ -569,8 +581,18 @@ void PickerWindow::EnsureSelectedTypeIsValid()
int index = this->callbacks.GetSelectedType();
if (std::any_of(std::begin(this->types), std::end(this->types), [class_index, index](const auto &item) { return item.class_index == class_index && item.index == index; })) return;
class_index = this->types.front().class_index;
index = this->types.front().index;
if (!this->types.empty()) {
class_index = this->types.front().class_index;
index = this->types.front().index;
} else {
/* Types can be empty if filters are enabled, find the first usable type. */
int count = this->callbacks.GetTypeCount(class_index);
for (int i = 0; i < count; i++) {
if (this->callbacks.GetTypeName(class_index, i) == INVALID_STRING_ID) continue;
index = i;
break;
}
}
this->callbacks.SetSelectedClass(class_index);
this->callbacks.SetSelectedType(index);
}