1
0
Fork 0

(svn r21255) -Fix (r179): main menu error messages wouldn't show when you had an error message open in the game while whatever triggered you to go back to the main menu

release/1.1
rubidium 2010-11-19 13:24:32 +00:00
parent 6d09f4a3cb
commit 999246f63e
2 changed files with 1 additions and 2 deletions

View File

@ -713,8 +713,6 @@ public:
~ErrmsgWindow() ~ErrmsgWindow()
{ {
SetRedErrorSquare(INVALID_TILE); SetRedErrorSquare(INVALID_TILE);
extern StringID _switch_mode_errorstr;
_switch_mode_errorstr = INVALID_STRING_ID;
} }
virtual EventState OnKeyPress(uint16 key, uint16 keycode) virtual EventState OnKeyPress(uint16 key, uint16 keycode)

View File

@ -1103,6 +1103,7 @@ void SwitchToMode(SwitchMode new_mode)
if (_switch_mode_errorstr != INVALID_STRING_ID) { if (_switch_mode_errorstr != INVALID_STRING_ID) {
ShowErrorMessage(_switch_mode_errorstr, INVALID_STRING_ID, WL_CRITICAL); ShowErrorMessage(_switch_mode_errorstr, INVALID_STRING_ID, WL_CRITICAL);
_switch_mode_errorstr = INVALID_STRING_ID;
} }
} }