summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-11-19 13:24:32 +0000
committerrubidium <rubidium@openttd.org>2010-11-19 13:24:32 +0000
commit999246f63eb1d83a25363e27ea26c1cb640e3c93 (patch)
tree3e2ee83e81369f2fa418381ce1bd84963e5f40e4 /src
parent6d09f4a3cbb0ebf40b568026f47220f01449857c (diff)
downloadopenttd-999246f63eb1d83a25363e27ea26c1cb640e3c93.tar.xz
(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
Diffstat (limited to 'src')
-rw-r--r--src/misc_gui.cpp2
-rw-r--r--src/openttd.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 5db7b91a3..4316adc7d 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -713,8 +713,6 @@ public:
~ErrmsgWindow()
{
SetRedErrorSquare(INVALID_TILE);
- extern StringID _switch_mode_errorstr;
- _switch_mode_errorstr = INVALID_STRING_ID;
}
virtual EventState OnKeyPress(uint16 key, uint16 keycode)
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 73c3b2e5b..ef7e356ea 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -1103,6 +1103,7 @@ void SwitchToMode(SwitchMode new_mode)
if (_switch_mode_errorstr != INVALID_STRING_ID) {
ShowErrorMessage(_switch_mode_errorstr, INVALID_STRING_ID, WL_CRITICAL);
+ _switch_mode_errorstr = INVALID_STRING_ID;
}
}