Merge pull request #4116 from Goober5000/fix_4115

Goober5000 · web-flow · commit 132818ff86fe · 2022-03-29T19:20:50.000-04:00
prevent the ship select dialog from crashing if there are too many IFFs
diff --git a/fred2/ship_select.cpp b/fred2/ship_select.cpp
@@ -160,14 +160,12 @@ BOOL ship_select::OnInitDialog()
 		if (i < (int)Iff_info.size())
 		{
 			GetDlgItem(IDC_FILTER_SHIPS_IFF[i])->SetWindowText(Iff_info[i].iff_name);
+			GetDlgItem(IDC_FILTER_SHIPS_IFF[i])->EnableWindow(m_filter_ships);
 		}
 
 		GetDlgItem(IDC_FILTER_SHIPS_IFF[i])->ShowWindow(i < (int)Iff_info.size());
 	}
 
-	for (i = 0; i < (int)Iff_info.size(); i++)
-		GetDlgItem(IDC_FILTER_SHIPS_IFF[i])->EnableWindow(m_filter_ships);
-
 	wlist_size = wplist_size = 0;
 	wing_index.clear();
 	wing_sel_last.clear();

Original file line number	Diff line number	Diff line change
`@@ -160,14 +160,12 @@ BOOL ship_select::OnInitDialog()`
`160`	`160`	`if (i < (int)Iff_info.size())`
`161`	`161`	`{`
`162`	`162`	`GetDlgItem(IDC_FILTER_SHIPS_IFF[i])->SetWindowText(Iff_info[i].iff_name);`
	`163`	`+ GetDlgItem(IDC_FILTER_SHIPS_IFF[i])->EnableWindow(m_filter_ships);`
`163`	`164`	`}`
`164`	`165`
`165`	`166`	`GetDlgItem(IDC_FILTER_SHIPS_IFF[i])->ShowWindow(i < (int)Iff_info.size());`
`166`	`167`	`}`
`167`	`168`
`168`		`- for (i = 0; i < (int)Iff_info.size(); i++)`
`169`		`- GetDlgItem(IDC_FILTER_SHIPS_IFF[i])->EnableWindow(m_filter_ships);`
`170`		`-`
`171`	`169`	`wlist_size = wplist_size = 0;`
`172`	`170`	`wing_index.clear();`
`173`	`171`	`wing_sel_last.clear();`