aboutsummaryrefslogtreecommitdiff
path: root/graphics/macgui/macmenu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/macgui/macmenu.cpp')
-rw-r--r--graphics/macgui/macmenu.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 2f95d012d5..d8fc4a6464 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -368,11 +368,13 @@ int MacMenu::addMenuItem(MacMenuSubMenu *submenu, const Common::U32String &text,
for (uint i = 0; i < text.size(); i++)
if (text[i] == amp[0]) {
- if ((text[i + 1] & 0xff) != '&') {
- shortcut = text[i + 1] & 0xff;
- shortcutPos = i;
- } else {
- res += text[i];
+ if (i < text.size() - 1) {
+ if ((text[i + 1] & 0xff) != '&') {
+ shortcut = text[i + 1] & 0xff;
+ shortcutPos = i;
+ } else {
+ res += text[i];
+ }
}
} else {
res += text[i];