(svn r19358) -Fix [FS#3663]: Close error messages about missing ownership when the company closes or is taken over. (parts by Alberth).

src/company_cmd.cpp

@@ -78,6 +78,8 @@ void Company::PostDestructor(size_t index)
 	InvalidateWindowData(WC_GRAPH_LEGEND, 0, (int)index);
 	InvalidateWindowData(WC_PERFORMANCE_DETAIL, 0, (int)index);
 	InvalidateWindowData(WC_COMPANY_LEAGUE, 0, 0);
+	/* If the currently shown error message has this company in it, the close it. */
+	InvalidateWindowData(WC_ERRMSG, 0);
 }
 
 /**

src/misc_gui.cpp

@@ -620,6 +620,12 @@ public:
 		this->DrawWidgets();
 	}
 
+	virtual void OnInvalidateData(int data)
+	{
+		/* If company gets shut down, while displaying an error about it, remove the error message. */
+		if (this->face != INVALID_COMPANY && !Company::IsValidID(this->face)) delete this;
+	}
+
 	virtual void SetStringParameters(int widget) const
 	{
 		if (widget == EMW_CAPTION) CopyInDParam(0, this->decode_params, lengthof(this->decode_params));