move check for event.xbutton.button <= GLUT_MAX_MENUS (see sf bug 1484284)

This commit is contained in:
Brian Paul 2006-05-10 19:21:39 +00:00
parent 700359ca5a
commit 1e7d84e258

View file

@ -439,11 +439,15 @@ processEventsAndTimeouts(void)
} else {
window = __glutGetWindow(event.xbutton.window);
/* added button check for mice with > 3 buttons */
if (window && event.xbutton.button <= GLUT_MAX_MENUS) {
if (window) {
GLUTmenu *menu;
int menuNum;
menuNum = window->menu[event.xbutton.button - 1];
if (event.xbutton.button <= GLUT_MAX_MENUS)
menuNum = window->menu[event.xbutton.button - 1];
else
menuNum = 0;
/* Make sure that __glutGetMenuByNum is only called if there
really is a menu present. */
if ((menuNum > 0) && (menu = __glutGetMenuByNum(menuNum))) {