# HG changeset patch
# User smatz <smatz@openttd.org>
# Date 2008-05-26 21:08:03
# Node ID 012afa66f9f0a11f103137a6c34b377735ca4125
# Parent  50409481b4e8dbd1d22b28d36c0cf066ff7e00ce

(svn r13275) -Fix: sort lists with 2 items, too
-Fix: reset VL_RESORT and resort timer even when no sort was needed

diff --git a/src/sortlist_type.h b/src/sortlist_type.h
--- a/src/sortlist_type.h
+++ b/src/sortlist_type.h
@@ -40,7 +40,7 @@ public: // Temporary: public for convers
 	 */
 	bool IsSortable() const
 	{
-		return (this->data != NULL && this->items > 2);
+		return (this->data != NULL && this->items >= 2);
 	}
 
 	/**
@@ -178,12 +178,16 @@ public:
 	 * */
 	FORCEINLINE void Sort(SortFunction compare)
 	{
+		/* Do not sort if the resort bit is not set */
+		if (!HASBITS(this->flags, VL_RESORT)) return;
+
+		CLRBITS(this->flags, VL_RESORT);
+
+		this->ResetResortTimer();
+
 		/* Do not sort when the list is not sortable */
 		if (!this->IsSortable()) return;
 
-		/* Do not sort if the resort bit is not set */
-		if (!HASBITS(this->flags, VL_RESORT)) return;
-
 		T *a = this->data;
 		T *b = a + 1;
 
@@ -213,10 +217,6 @@ public:
 				}
 			}
 		}
-
-		this->ResetResortTimer();
-
-		CLRBITS(this->flags, VL_RESORT);
 	}
 
 	/**