Merge branch 'master' into jgrpp

# Conflicts: # config.lib
2016-06-02 19:25:23 +01:00
parent 09291a3b74 5ac736ec00
commit 655b329142
6 changed files with 46 additions and 22 deletions
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -665,7 +665,8 @@ struct DepotWindow : Window {
 			DepotSortList(&this->vehicle_list);

 			uint new_unitnumber_digits = GetUnitNumberDigits(this->vehicle_list);
-			if (this->unitnumber_digits != new_unitnumber_digits) {
+			/* Only increase the size; do not decrease to prevent constant changes */
+			if (this->unitnumber_digits < new_unitnumber_digits) {
 				this->unitnumber_digits = new_unitnumber_digits;
 				this->ReInit();
 			}