Disable context menu trigger if the assigned menu is set to null

9 years ago · 72cae92320
1 changed files with 2 additions and 0 deletions
--- a/common/tool/tool_interactive.cpp
+++ b/common/tool/tool_interactive.cpp
@ -68,6 +68,8 @@ void TOOL_INTERACTIVE::SetContextMenu( CONTEXT_MENU* aMenu, CONTEXT_MENU_TRIGGER
 {
    if( aMenu )
        aMenu->SetTool( this );
+    else
+        aTrigger = CMENU_OFF;

    m_toolMgr->ScheduleContextMenu( this, aMenu, aTrigger );
 }