From d5a416d5ea2d8395ca03dfa74b26f5d1cb6a9a45 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 6 Jul 2021 20:25:46 +0300
Subject: [PATCH] Beta version 2.8.6: Fix build for macOS.

---
 Telegram/SourceFiles/editor/editor_paint.cpp    | 2 +-
 Telegram/SourceFiles/history/history_widget.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/editor/editor_paint.cpp b/Telegram/SourceFiles/editor/editor_paint.cpp
index efe8e35b3..a48f7fef6 100644
--- a/Telegram/SourceFiles/editor/editor_paint.cpp
+++ b/Telegram/SourceFiles/editor/editor_paint.cpp
@@ -132,7 +132,7 @@ Paint::Paint(
 		controllers->stickersPanelController
 			? controllers->stickersPanelController->stickerChosen(
 				) | rpl::to_empty
-			: rpl::never<>(),
+			: rpl::never<>() | rpl::type_erased(),
 		_scene->addsItem()
 	) | rpl::start_with_next([=] {
 		clearRedoList();
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 218950c59..5969ddeb5 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4256,7 +4256,7 @@ void HistoryWidget::updateFieldPlaceholder() {
 		return;
 	}
 
-	_field->setPlaceholder([&] {
+	_field->setPlaceholder([&]() -> rpl::producer<QString> {
 		if (_editMsgId) {
 			return tr::lng_edit_message_text();
 		} else if (!_history) {