MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of workingDirChosen variable 

It's set in every codepath where cWorkingDir is non-empty.
This commit is contained in:
Ilya Fedin 2023-08-14 10:14:51 +04:00 committed by John Preston
parent 92a41c881d
commit 7dfeea3f4e
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Telegram/SourceFiles/logs.cpp
View File

@ -354,30 +354,16 @@ void start() {
return;
}
auto workingDirChosen = false;
if (cAlphaVersion()) {
workingDirChosen = true;
} else {
if (!cWorkingDir().isEmpty()) {
// This value must come from TelegramForcePortable
workingDirChosen = true;
#if (!defined Q_OS_WIN && !defined _DEBUG) || defined Q_OS_WINRT || defined OS_WIN_STORE || defined OS_MAC_STORE
} else {
cForceWorkingDir(psAppDataPath());
workingDirChosen = true;
#endif // (!Q_OS_WIN && !_DEBUG) || Q_OS_WINRT || OS_WIN_STORE || OS_MAC_STORE
}
}
LogsData = new LogsDataFields();
if (!workingDirChosen) {
if (cWorkingDir().isEmpty()) {
#if (!defined Q_OS_WIN && !defined _DEBUG) || defined Q_OS_WINRT || defined OS_WIN_STORE || defined OS_MAC_STORE
cForceWorkingDir(psAppDataPath());
#else // (!Q_OS_WIN && !_DEBUG) || Q_OS_WINRT || OS_WIN_STORE || OS_MAC_STORE
cForceWorkingDir(cExeDir());
if (!LogsData->openMain()) {
cForceWorkingDir(psAppDataPath());
}
#endif // (!Q_OS_WIN && !_DEBUG) || Q_OS_WINRT || OS_WIN_STORE || OS_MAC_STORE
}
if (launcher.validateCustomWorkingDir()) {