From f128665f6b6d1761f0153a42e185447c8f0b401b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 19 Sep 2020 23:17:41 +0400
Subject: [PATCH] Fix -debug argument

processArguments is called before ComputeDebugMode gets called, Logs::DebugEnabled gets overriden that way.
Fix that by setting gDebugMode variable and checking it in ComputeDebugMode.
---
 Telegram/SourceFiles/core/launcher.cpp | 5 ++++-
 Telegram/SourceFiles/settings.cpp      | 1 +
 Telegram/SourceFiles/settings.h        | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index 46066bfff8..ee01d01e07 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -94,6 +94,9 @@ void ComputeDebugMode() {
 	if (file.exists() && file.open(QIODevice::ReadOnly)) {
 		Logs::SetDebugEnabled(file.read(1) != "0");
 	}
+	if (cDebugMode()) {
+		Logs::SetDebugEnabled(true);
+	}
 }
 
 void ComputeExternalUpdater() {
@@ -482,7 +485,7 @@ void Launcher::processArguments() {
 		SetUpdaterDisabledAtStartup();
 	}
 	gUseFreeType = parseResult.contains("-freetype");
-	Logs::SetDebugEnabled(parseResult.contains("-debug"));
+	gDebugMode = parseResult.contains("-debug");
 	gManyInstance = parseResult.contains("-many");
 	gKeyFile = parseResult.value("-key", {}).join(QString()).toLower();
 	gKeyFile = gKeyFile.replace(QRegularExpression("[^a-z0-9\\-_]"), {});
diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp
index 2683ad857e..09065ecb5c 100644
--- a/Telegram/SourceFiles/settings.cpp
+++ b/Telegram/SourceFiles/settings.cpp
@@ -47,6 +47,7 @@ bool gRestartingUpdate = false, gRestarting = false, gRestartingToSettings = fal
 int32 gLastUpdateCheck = 0;
 bool gNoStartUpdate = false;
 bool gStartToSettings = false;
+bool gDebugMode = false;
 
 uint32 gConnectionsInSession = 1;
 
diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h
index d5d13e7c51..ded46cddf6 100644
--- a/Telegram/SourceFiles/settings.h
+++ b/Telegram/SourceFiles/settings.h
@@ -87,6 +87,7 @@ DeclareSetting(bool, WriteProtected);
 DeclareSetting(int32, LastUpdateCheck);
 DeclareSetting(bool, NoStartUpdate);
 DeclareSetting(bool, StartToSettings);
+DeclareSetting(bool, DebugMode);
 DeclareReadSetting(bool, ManyInstance);
 
 DeclareSetting(QByteArray, LocalSalt);