(svn r23493) -Fix (r23476): clearing errors didn't clear the currently shown critical error

This commit is contained in:
rubidium 2011-12-11 12:20:02 +00:00
parent e0e5e51e2a
commit f3b78bf076

View File

@ -301,6 +301,7 @@ public:
*/ */
void ClearErrorMessages() void ClearErrorMessages()
{ {
UnshowCriticalError();
_errors.clear(); _errors.clear();
} }
@ -322,7 +323,7 @@ void ShowFirstError()
void UnshowCriticalError() void UnshowCriticalError()
{ {
ErrmsgWindow *w = (ErrmsgWindow*)FindWindowById(WC_ERRMSG, 0); ErrmsgWindow *w = (ErrmsgWindow*)FindWindowById(WC_ERRMSG, 0);
if (w != NULL) { if (_window_system_initialized && w != NULL) {
if (w->IsCritical()) _errors.push_front(*w); if (w->IsCritical()) _errors.push_front(*w);
_window_system_initialized = false; _window_system_initialized = false;
delete w; delete w;