src/autoreplace_gui.cpp

@@ -229,7 +229,6 @@ class ReplaceVehicleWindow : public Window {
 				/* Always empty the right engines list when nothing is selected in the left engines list */
 				this->engines[1].clear();
 				this->sel_engine[1] = INVALID_ENGINE;
-				this->vscroll[1]->SetCount(this->engines[1].size());
 			} else {
 				if (this->reset_sel_engine && this->sel_engine[0] != INVALID_ENGINE) {
 					/* Select the current replacement for sel_engine[0]. */

src/vehicle_gui.cpp

@@ -1936,6 +1936,11 @@ public:
 			case WID_VL_CAPTION_SHARED_ORDERS: {
 				switch (this->vli.type) {
 					case VL_SHARED_ORDERS: // Shared Orders
+						if (this->vehicles.size() == 0) {
+							/* We can't open this window without vehicles using this order
+							 * and we should close the window when deleting the order. */
+							NOT_REACHED();
+						}
 						SetDParam(0, this->vehicles.size());
 						break;