From f1b4a82015211eec3c2e4ea18583e4e45f34b61b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 Jul 2020 10:25:12 +0400
Subject: [PATCH] Fix crash in password submit.

---
 Telegram/SourceFiles/intro/intro_password_check.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/intro/intro_password_check.cpp b/Telegram/SourceFiles/intro/intro_password_check.cpp
index 2a49f3255a..d1a3ce50cb 100644
--- a/Telegram/SourceFiles/intro/intro_password_check.cpp
+++ b/Telegram/SourceFiles/intro/intro_password_check.cpp
@@ -187,16 +187,18 @@ void PasswordCheckWidget::requestPasswordData() {
 	).done([=](const MTPaccount_Password &result) {
 		_sentRequest = 0;
 		result.match([&](const MTPDaccount_password &data) {
-			_request = Core::ParseCloudPasswordCheckRequest(data);
+			auto request = Core::ParseCloudPasswordCheckRequest(data);
+			if (request && request.id) {
+				_request = std::move(request);
+			} else {
+				// Maybe the password was removed? Just submit it once again.
+			}
 			passwordChecked();
 		});
 	}).send();
 }
 
 void PasswordCheckWidget::passwordChecked() {
-	if (!_request || !_request.id) {
-		return serverError();
-	}
 	const auto check = Core::ComputeCloudPasswordCheck(
 		_request,
 		_passwordHash);