From 9fd8b040b7f4186459421dc902d6dc40563d07fd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jul 2017 17:42:28 +0300
Subject: [PATCH] Fix crash in history switch.

Don't call anything heavy between changing _history and _list.
---
 Telegram/SourceFiles/history/history_widget.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 9e1d8b1bd9..0775c4a715 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1970,7 +1970,6 @@ void HistoryWidget::showHistory(const PeerId &peerId, MsgId showAtMsgId, bool re
 
 		_history = App::history(_peer->id);
 		_migrated = _peer->migrateFrom() ? App::history(_peer->migrateFrom()->id) : 0;
-		updateForwarding();
 
 		if (_channel) {
 			updateNotifySettings();
@@ -2031,7 +2030,7 @@ void HistoryWidget::showHistory(const PeerId &peerId, MsgId showAtMsgId, bool re
 		clearFieldText();
 		doneShow();
 	}
-
+	updateForwarding();
 	updateOverStates(mapFromGlobal(QCursor::pos()));
 
 	if (App::wnd()) QTimer::singleShot(0, App::wnd(), SLOT(setInnerFocus()));