From 43570d1613671000581cfb5d3e2f0b1c9a0b604e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 Nov 2017 21:35:35 +0400
Subject: [PATCH] Check current chat before auto-closing it.

Close current chat only if it is the one being delete-and-exit'ed.
---
 Telegram/SourceFiles/window/window_peer_menu.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 28e62c253ec807..3b126999424d10 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -110,7 +110,9 @@ auto DeleteAndLeaveHandler(not_null<PeerData*> peer) {
 			if (!App::main()) return;
 
 			Ui::hideLayer();
-			Ui::showChatsList();
+			if (App::wnd()->controller()->activePeer.current() == peer) {
+				Ui::showChatsList();
+			}
 			if (peer->isUser()) {
 				App::main()->deleteConversation(peer);
 			} else if (auto chat = peer->asChat()) {