From bbd64bbe2bbf37cdc34b859c35a6361f1489fd1d Mon Sep 17 00:00:00 2001
From: Peter Nelson <peter1138@openttd.org>
Date: Sat, 4 Nov 2023 14:42:47 +0000
Subject: [PATCH] Fix #9545: Crash when all cargo types are disabled. (#11432)
This is not a very useful state, but it's nice to not crash.
Some parts of the game don't (yet) check for cargo types being redefined, that is out-of-scope here.
---
src/graph_gui.cpp | 5 +++--
src/linkgraph/linkgraph_gui.cpp | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp
index 27c67e3f08..c84eaf8b08 100644
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -363,7 +363,6 @@ protected:
if (this->num_on_x_axis == 0) return;
assert(this->num_on_x_axis > 0);
- assert(this->num_dataset > 0);
/* draw text strings on the y axis */
int64_t y_label = interval.highest;
@@ -923,6 +922,8 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
return;
}
+ size->height = FONT_HEIGHT_SMALL + WidgetDimensions::scaled.framerect.Vertical();
+
for (const CargoSpec *cs : _sorted_standard_cargo_specs) {
SetDParam(0, cs->name);
Dimension d = GetStringBoundingBox(STR_GRAPH_CARGO_PAYMENT_CARGO);
@@ -1077,7 +1078,7 @@ static const NWidgetPart _nested_cargo_payment_rates_widgets[] = {
NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CPR_DISABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_DISABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL), SetFill(1, 0),
NWidget(NWID_SPACER), SetMinimalSize(0, 4),
NWidget(NWID_HORIZONTAL),
- NWidget(WWT_MATRIX, COLOUR_BROWN, WID_CPR_MATRIX), SetResize(0, 2), SetMatrixDataTip(1, 0, STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO), SetScrollbar(WID_CPR_MATRIX_SCROLLBAR),
+ NWidget(WWT_MATRIX, COLOUR_BROWN, WID_CPR_MATRIX), SetFill(1, 0), SetResize(0, 2), SetMatrixDataTip(1, 0, STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO), SetScrollbar(WID_CPR_MATRIX_SCROLLBAR),
NWidget(NWID_VSCROLLBAR, COLOUR_BROWN, WID_CPR_MATRIX_SCROLLBAR),
EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 24), SetFill(0, 1),
diff --git a/src/linkgraph/linkgraph_gui.cpp b/src/linkgraph/linkgraph_gui.cpp
index 2c666ef515..2fb08618d2 100644
--- a/src/linkgraph/linkgraph_gui.cpp
+++ b/src/linkgraph/linkgraph_gui.cpp
@@ -501,7 +501,8 @@ NWidgetBase *MakeCargoesLegendLinkGraphGUI(int *biggest_index)
spc->SetResize(0, 0);
col->Add(spc);
}
- panel->Add(col);
+ /* If there are no cargo specs defined, then col won't have been created so don't add it. */
+ if (col != nullptr) panel->Add(col);
*biggest_index = WID_LGL_CARGO_LAST;
return panel;
}