diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 1d72a05fc..a104b3a56 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -2808,7 +2808,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not if (threadMessageId == 0 && !UserObject.isReplyUser(currentUser) || threadMessageObject != null && threadMessageObject.getRepliesCount() == 0) { searchItem.setVisibility(View.GONE); } - viewInChatItem.setVisibility(View.VISIBLE); + if (viewInChatItem != null) + viewInChatItem.setVisibility(View.VISIBLE); searchItemVisible = false; getMediaDataController().clearFoundMessageObjects(); if (messagesSearchAdapter != null) { @@ -24716,7 +24717,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not audioCallIconItem.setVisibility(View.GONE); } searchItemVisible = true; - viewInChatItem.setVisibility(View.GONE); + if (viewInChatItem != null) + viewInChatItem.setVisibility(View.GONE); updateSearchButtons(0, 0, -1); updateBottomOverlay(); }