X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_menu.c;h=ae7405c7158c54332ca4cf002ef0c44a44094a5d;hb=f4b802a47ef27c25a283a68932956fb7898771f1;hp=1b07b1ab07c6aeb2bde6d42032e5573b808573c8;hpb=4941da223c8a1e2819d968c97fa31abb118fda87;p=freeglut diff --git a/src/fg_menu.c b/src/fg_menu.c index 1b07b1a..ae7405c 100644 --- a/src/fg_menu.c +++ b/src/fg_menu.c @@ -784,14 +784,16 @@ int FGAPIENTRY glutCreateMenuUcall( FGCBMenuUC callback, FGCBUserData userData ) { /* The menu object creation code resides in fg_structure.c */ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenuUcall" ); - if (fgState.ActiveMenus) - fgError("Menu manipulation not allowed while menus in use."); + if (fgState.ActiveMenus) + { + fgError( "Menu manipulation not allowed while menus in use." ); + } return fgCreateMenu( callback, userData )->ID; } /* Standard glutCreateMenu */ -static void glutCreateMenuCallback( int menu, FGCBUserData userData ) +static void fghCreateMenuCallback( int menu, FGCBUserData userData ) { FGCBMenu callback = (FGCBMenu)userData; callback( menu ); @@ -801,8 +803,10 @@ int FGAPIENTRY glutCreateMenu( FGCBMenu callback ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" ); if (!callback) + { return glutCreateMenuUcall( NULL, NULL ); - return glutCreateMenuUcall( glutCreateMenuCallback, (FGCBUserData)callback ); + } + return glutCreateMenuUcall( fghCreateMenuCallback, (FGCBUserData)callback ); } /*