RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Ilya Fedin 2020-09-19 23:17:41 +04:00 committed by John Preston
parent 0cd68f866d
commit f128665f6b
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/core/launcher.cpp
View File

@ -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\\-_]"), {});

1
Telegram/SourceFiles/settings.cpp
View File

@ -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;

1
Telegram/SourceFiles/settings.h
View File

@ -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);