From 56c4d164f3d83b38ad44de33cb16bbb1c427d531 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 24 Aug 2019 18:02:05 +0300
Subject: [PATCH] Fix crash in group creation.

---
 Telegram/SourceFiles/base/unixtime.cpp        |  1 +
 .../SourceFiles/boxes/add_contact_box.cpp     | 82 ++++++++++---------
 2 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/Telegram/SourceFiles/base/unixtime.cpp b/Telegram/SourceFiles/base/unixtime.cpp
index b4ef55eb1..1ee0a44e3 100644
--- a/Telegram/SourceFiles/base/unixtime.cpp
+++ b/Telegram/SourceFiles/base/unixtime.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QReadWriteLock>
 
 #ifdef Q_OS_WIN
+#include <windows.h>
 #elif defined Q_OS_MAC
 #include <mach/mach_time.h>
 #else
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index 49c9fc258..bbae845eb 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -58,6 +58,48 @@ bool IsValidPhone(QString phone) {
 				|| phone == qsl("4242")));
 }
 
+void ChatCreateDone(
+		not_null<Window::SessionNavigation*> navigation,
+		QImage image,
+		const MTPUpdates &updates) {
+	navigation->session().api().applyUpdates(updates);
+
+	auto success = base::make_optional(&updates)
+		| [](auto updates) -> std::optional<const QVector<MTPChat>*> {
+			switch (updates->type()) {
+			case mtpc_updates:
+				return &updates->c_updates().vchats().v;
+			case mtpc_updatesCombined:
+				return &updates->c_updatesCombined().vchats().v;
+			}
+			LOG(("API Error: unexpected update cons %1 "
+				"(GroupInfoBox::creationDone)").arg(updates->type()));
+			return std::nullopt;
+		}
+		| [](auto chats) {
+			return (!chats->empty()
+				&& chats->front().type() == mtpc_chat)
+				? base::make_optional(chats)
+				: std::nullopt;
+		}
+		| [&](auto chats) {
+			return navigation->session().data().chat(
+				chats->front().c_chat().vid().v);
+		}
+		| [&](not_null<ChatData*> chat) {
+			if (!image.isNull()) {
+				chat->session().api().uploadPeerPhoto(
+					chat,
+					std::move(image));
+			}
+			Ui::showPeerHistory(chat, ShowAtUnreadMsgId);
+		};
+	if (!success) {
+		LOG(("API Error: chat not found in updates "
+			"(ContactsBox::creationDone)"));
+	}
+}
+
 } // namespace
 
 style::InputField CreateBioFieldStyle() {
@@ -525,44 +567,10 @@ void GroupInfoBox::createGroup(
 		MTP_string(title)
 	)).done([=](const MTPUpdates &result) {
 		auto image = _photo->takeResultImage();
-		Ui::hideLayer();
+		const auto navigation = _navigation;
 
-		_navigation->session().api().applyUpdates(result);
-
-		auto success = base::make_optional(&result)
-			| [](auto updates) -> std::optional<const QVector<MTPChat>*> {
-				switch (updates->type()) {
-				case mtpc_updates:
-					return &updates->c_updates().vchats().v;
-				case mtpc_updatesCombined:
-					return &updates->c_updatesCombined().vchats().v;
-				}
-				LOG(("API Error: unexpected update cons %1 "
-					"(GroupInfoBox::creationDone)").arg(updates->type()));
-				return std::nullopt;
-			}
-			| [](auto chats) {
-				return (!chats->empty()
-					&& chats->front().type() == mtpc_chat)
-					? base::make_optional(chats)
-					: std::nullopt;
-			}
-			| [&](auto chats) {
-				return _navigation->session().data().chat(
-					chats->front().c_chat().vid().v);
-			}
-			| [&](not_null<ChatData*> chat) {
-				if (!image.isNull()) {
-					chat->session().api().uploadPeerPhoto(
-						chat,
-						std::move(image));
-				}
-				Ui::showPeerHistory(chat, ShowAtUnreadMsgId);
-			};
-		if (!success) {
-			LOG(("API Error: chat not found in updates "
-				"(ContactsBox::creationDone)"));
-		}
+		Ui::hideLayer(); // Destroys 'this'.
+		ChatCreateDone(navigation, std::move(image), result);
 	}).fail([=](const RPCError &error) {
 		_creationRequestId = 0;
 		if (error.type() == qstr("NO_CHAT_TITLE")) {