From 296e009808a93a2580116d9fdad24b47959652e3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 10 May 2018 13:24:40 +0300
Subject: [PATCH] Fix proxy icon doubling.

Fixes #4666.
---
 .../SourceFiles/window/window_connecting_widget.cpp  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_connecting_widget.cpp b/Telegram/SourceFiles/window/window_connecting_widget.cpp
index 9b61e9624..59fca8434 100644
--- a/Telegram/SourceFiles/window/window_connecting_widget.cpp
+++ b/Telegram/SourceFiles/window/window_connecting_widget.cpp
@@ -205,10 +205,9 @@ base::unique_qptr<ConnectingWidget> ConnectingWidget::CreateDefaultWidget(
 	const auto weak = result.get();
 	rpl::combine(
 		result->visibility(),
-		parent->heightValue(),
-		std::move(shown)
-	) | rpl::start_with_next([=](float64 visible, int height, bool shown) {
-		const auto hidden = (visible == 0.) || !shown;
+		parent->heightValue()
+	) | rpl::start_with_next([=](float64 visible, int height) {
+		const auto hidden = (visible == 0.);
 		if (weak->isHidden() != hidden) {
 			weak->setVisible(!hidden);
 		}
@@ -218,6 +217,11 @@ base::unique_qptr<ConnectingWidget> ConnectingWidget::CreateDefaultWidget(
 			height - weak->height(),
 			visible));
 	}, weak->lifetime());
+	std::move(
+		shown
+	) | rpl::start_with_next([=](bool shown) {
+		weak->setForceHidden(!shown);
+	}, weak->lifetime());
 	result->finishAnimating();
 	return result;
 }