From 72cae92320755250f0c297f81071b2978f45bd83 Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Fri, 24 Feb 2017 12:46:49 +0100 Subject: [PATCH] Disable context menu trigger if the assigned menu is set to null --- common/tool/tool_interactive.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/tool/tool_interactive.cpp b/common/tool/tool_interactive.cpp index ec198c079f..38f78aa6ce 100644 --- 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 ); }