diff --git a/TelegramBotBase/MessageLoops/FormBaseMessageLoop.cs b/TelegramBotBase/MessageLoops/FormBaseMessageLoop.cs index 5d719b1..bdc6374 100644 --- a/TelegramBotBase/MessageLoops/FormBaseMessageLoop.cs +++ b/TelegramBotBase/MessageLoops/FormBaseMessageLoop.cs @@ -84,8 +84,11 @@ public class FormBaseMessageLoop : IMessageLoopFactory //Send Action event to controls await activeForm.ActionControls(mr); - //Send Action event to form itself - await activeForm.Action(mr); + if (!mr.Handled) + { + //Send Action event to form itself, if not already handled by a control + await activeForm.Action(mr); + } if (!mr.Handled) { diff --git a/TelegramBotBase/MessageLoops/FullMessageLoop.cs b/TelegramBotBase/MessageLoops/FullMessageLoop.cs index 061a2ab..a0c1c51 100644 --- a/TelegramBotBase/MessageLoops/FullMessageLoop.cs +++ b/TelegramBotBase/MessageLoops/FullMessageLoop.cs @@ -77,8 +77,11 @@ public class FullMessageLoop : IMessageLoopFactory //Send Action event to controls await activeForm.ActionControls(mr); - //Send Action event to form itself - await activeForm.Action(mr); + if (!mr.Handled) + { + //Send Action event to form itself, if not already handled by a control + await activeForm.Action(mr); + } if (!mr.Handled) {