Merge branch 'master' into sync

This commit is contained in:
Lonami Exo 2018-06-28 15:50:46 +02:00
commit d0ebb7790c

View File

@ -410,7 +410,10 @@ class Message:
"""
Returns the total button count.
"""
if self._buttons_count is not None and isinstance(
if not isinstance(self.original_message, types.Message):
return 0
if self._buttons_count is None and isinstance(
self.original_message.reply_markup, (
types.ReplyInlineMarkup, types.ReplyKeyboardMarkup
)):