[Scummvm-git-logs] scummvm master -> 9afaefb7486854e7804bc5a12f86545a7dd8a6f4

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9afaefb748 GRAPHHICS: MACGUI: Fix crash on submenu rendering


Commit: 9afaefb7486854e7804bc5a12f86545a7dd8a6f4
    https://github.com/scummvm/scummvm/commit/9afaefb7486854e7804bc5a12f86545a7dd8a6f4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-02T16:50:34+02:00

Commit Message:
GRAPHHICS: MACGUI: Fix crash on submenu rendering

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 91c01e0..0079ced 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -742,7 +742,7 @@ void MacMenu::renderSubmenu(MacMenuSubMenu *menu) {
 		y += kMenuDropdownItemHeight;
 	}
 
-	if (menu->subitems[_activeSubItem]->submenu != nullptr)
+	if (_activeSubItem != -1 && menu->subitems[_activeSubItem]->submenu != nullptr)
 		renderSubmenu(menu->subitems[_activeSubItem]->submenu);
 
 	_contentIsDirty = true;