From d08cbe8b0ebfbba44bd26d84e062a74862c76abb Mon Sep 17 00:00:00 2001
From: FlorianDahn <ich@florian-dahn.de>
Date: Sat, 16 Apr 2022 15:36:55 +0200
Subject: [PATCH] Bugfix with MessageResult leads to having not access to
 MessageClient

---
 TelegramBotBase/Base/MessageResult.cs |  6 ------
 TelegramBotBase/Base/ResultBase.cs    | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/TelegramBotBase/Base/MessageResult.cs b/TelegramBotBase/Base/MessageResult.cs
index 762ac8f..2e6148b 100644
--- a/TelegramBotBase/Base/MessageResult.cs
+++ b/TelegramBotBase/Base/MessageResult.cs
@@ -29,12 +29,6 @@ namespace TelegramBotBase.Base
             }
         }
 
-        public DeviceSession Device
-        {
-            get;
-            set;
-        }
-
         /// <summary>
         /// The message id
         /// </summary>
diff --git a/TelegramBotBase/Base/ResultBase.cs b/TelegramBotBase/Base/ResultBase.cs
index e5d37e8..5cce472 100644
--- a/TelegramBotBase/Base/ResultBase.cs
+++ b/TelegramBotBase/Base/ResultBase.cs
@@ -4,12 +4,26 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Telegram.Bot;
+using TelegramBotBase.Sessions;
 
 namespace TelegramBotBase.Base
 {
     public class ResultBase : EventArgs
     {
-        public MessageClient Client { get; set; }
+        public MessageClient Client
+        {
+            get
+            {
+                return Device.ActiveForm.Client;
+            }
+        }
+
+
+        public DeviceSession Device
+        {
+            get;
+            set;
+        }
 
         public virtual long DeviceId { get; set; }