From 5383ae3d96bd936102b6ec256f199d5567378b6f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 17 Aug 2021 15:37:17 +0300
Subject: [PATCH] Fix log in after password change by email.

---
 Telegram/SourceFiles/boxes/boxes.style      |  2 +-
 Telegram/SourceFiles/boxes/passcode_box.cpp | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 30a8b48e7..a51f2dcf3 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -324,7 +324,7 @@ passcodePadding: margins(0px, 0px, 0px, 5px);
 passcodeTextLine: 28px;
 passcodeLittleSkip: 5px;
 passcodeAboutSkip: 7px;
-passcodeSkip: 20px;
+passcodeSkip: 23px;
 
 newGroupAboutFg: windowSubTextFg;
 newGroupPadding: margins(4px, 6px, 4px, 3px);
diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp
index b322c69bc..8f3e20fad 100644
--- a/Telegram/SourceFiles/boxes/passcode_box.cpp
+++ b/Telegram/SourceFiles/boxes/passcode_box.cpp
@@ -437,12 +437,14 @@ void PasscodeBox::recoverPasswordDone(
 	_setRequest = 0;
 	const auto weak = Ui::MakeWeak(this);
 	_newAuthorization.fire_copy(result);
-	_newPasswordSet.fire_copy(newPasswordBytes);
 	if (weak) {
-		getDelegate()->show(Box<InformBox>(
-			tr::lng_cloud_password_updated(tr::now)));
+		_newPasswordSet.fire_copy(newPasswordBytes);
 		if (weak) {
-			closeBox();
+			getDelegate()->show(Box<InformBox>(
+				tr::lng_cloud_password_updated(tr::now)));
+			if (weak) {
+				closeBox();
+			}
 		}
 	}
 }