From 6fbd0d7deb0ae2815d502b43c8606b1f307cd7f4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Feb 2020 07:58:29 +0400
Subject: [PATCH] Fix logout on second relaunch.

Fixes #7279.
---
 Telegram/SourceFiles/storage/localstorage.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp
index 8d83f7bf1..cac8a7bb3 100644
--- a/Telegram/SourceFiles/storage/localstorage.cpp
+++ b/Telegram/SourceFiles/storage/localstorage.cpp
@@ -2896,7 +2896,7 @@ base::flat_set<QString> CollectGoodNames() {
 		_exportSettingsKey,
 		_trustedBotsKey
 	};
-	auto result = base::flat_set<QString>{ "map0", "map1" };
+	auto result = base::flat_set<QString>{ "map0", "map1", "maps" };
 	const auto push = [&](FileKey key) {
 		if (!key) {
 			return;
@@ -2905,6 +2905,8 @@ base::flat_set<QString> CollectGoodNames() {
 		result.emplace(name);
 		name[name.size() - 1] = '1';
 		result.emplace(name);
+		name[name.size() - 1] = 's';
+		result.emplace(name);
 	};
 	for (const auto &value : _draftsMap) {
 		push(value);
@@ -5120,7 +5122,7 @@ void ClearManager::onStart() {
 					if (!QDir(di.filePath()).removeRecursively()) result = false;
 				} else {
 					QString path = di.filePath();
-					if (!path.endsWith(qstr("map0")) && !path.endsWith(qstr("map1"))) {
+					if (!path.endsWith(qstr("map0")) && !path.endsWith(qstr("map1")) && !path.endsWith(qstr("maps"))) {
 						if (!QFile::remove(di.filePath())) result = false;
 					}
 				}