From f316d951aeb75cafd8796e69e9492cb8368ceb29 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 Jul 2020 16:26:43 +0400
Subject: [PATCH] Fix stickers list display after account switch.

---
 Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp | 1 +
 Telegram/SourceFiles/main/main_session.cpp            | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 6707f5da0d..a4c7a805ac 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -369,6 +369,7 @@ TabbedSelector::TabbedSelector(
 		) | rpl::start_with_next([=] {
 			refreshStickers();
 		}, lifetime());
+		refreshStickers();
 	}
 	//setAttribute(Qt::WA_AcceptTouchEvents);
 	setAttribute(Qt::WA_OpaquePaintEvent, false);
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index f59c119a0d..4f9873ea05 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -135,6 +135,8 @@ Session::Session(
 			saveSettingsDelayed();
 		}
 
+		// Storage::Account uses Main::Account::session() in those methods.
+		// So they can't be called during Main::Session construction.
 		local().readInstalledStickers();
 		local().readFeaturedStickers();
 		local().readRecentStickers();