summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-02-06 18:00:05 +0000
committerrubidium <rubidium@openttd.org>2009-02-06 18:00:05 +0000
commit841050ec8353118df6a0de7dc7a2b56fde74f24a (patch)
tree549f6eccba291590efb076d37b3aa5118c193086
parentcecc3863cdcc355ab6245bf8ebb8d62a468877ea (diff)
downloadopenttd-841050ec8353118df6a0de7dc7a2b56fde74f24a.tar.xz
(svn r15377) -Fix [FS#2607]: filter did resort when unneeded and didn't deselect properly in some cases (Roujin)
-rw-r--r--src/network/network_content_gui.cpp11
-rw-r--r--src/sortlist_type.h4
2 files changed, 10 insertions, 5 deletions
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index 5ae37eca1..3c56a69c8 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -279,15 +279,18 @@ class NetworkContentListWindow : public QueryStringBaseWindow, ContentCallback {
{
if (!this->content.Filter(this->edit_str_buf)) return;
- this->selected = NULL;
- this->list_pos = 0;
-
+ /* update list position */
for (ConstContentIterator iter = this->content.Begin(); iter != this->content.End(); iter++) {
if (*iter == this->selected) {
this->list_pos = iter - this->content.Begin();
- break;
+ this->ScrollToSelected();
+ return;
}
}
+
+ /* previously selected item not in list anymore */
+ this->selected = NULL;
+ this->list_pos = 0;
}
/** Make sure that the currently selected content info is within the visible part of the matrix */
diff --git a/src/sortlist_type.h b/src/sortlist_type.h
index ba9f8a8d2..29c7cc4c3 100644
--- a/src/sortlist_type.h
+++ b/src/sortlist_type.h
@@ -321,16 +321,18 @@ public:
/* Do not filter if the filter bit is not set */
if (!HASBITS(this->flags, VL_FILTER)) return false;
+ bool changed = false;
for (uint iter = 0; iter < this->items;) {
T *item = &this->data[iter];
if (!decide(item, filter_data)) {
this->Erase(item);
+ changed = true;
} else {
iter++;
}
}
- return true;
+ return changed;
}
/**