From f3b78bf076724b10d5e70fdac7babca228447b78 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sun, 11 Dec 2011 12:20:02 +0000
Subject: (svn r23493) -Fix (r23476): clearing errors didn't clear the
 currently shown critical error

---
 src/error_gui.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/error_gui.cpp b/src/error_gui.cpp
index a7179079a..31a887cc7 100644
--- a/src/error_gui.cpp
+++ b/src/error_gui.cpp
@@ -301,6 +301,7 @@ public:
  */
 void ClearErrorMessages()
 {
+	UnshowCriticalError();
 	_errors.clear();
 }
 
@@ -322,7 +323,7 @@ void ShowFirstError()
 void UnshowCriticalError()
 {
 	ErrmsgWindow *w = (ErrmsgWindow*)FindWindowById(WC_ERRMSG, 0);
-	if (w != NULL) {
+	if (_window_system_initialized && w != NULL) {
 		if (w->IsCritical()) _errors.push_front(*w);
 		_window_system_initialized = false;
 		delete w;
-- 
cgit v1.2.3-70-g09d2