mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-05 09:05:14 +00:00
Code Issues Releases Wiki Activity

Detect when -workdir value is not really custom

Browse Source
This commit is contained in:
Ilya Fedin
2023-07-22 01:07:22 +04:00
committed by John Preston
parent 100e875530
commit cd7539c001
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -394,6 +394,18 @@ int Launcher::exec() {
return result;
}
bool Launcher::validateCustomWorkingDir() {
if (customWorkingDir()) {
if (_customWorkingDir == cWorkingDir()) {
_customWorkingDir = {};
return false;
}
cForceWorkingDir(_customWorkingDir);
return true;
}
return false;
}
void Launcher::workingFolderReady() {
srand((unsigned int)time(nullptr));
@@ -435,7 +447,7 @@ const QStringList &Launcher::arguments() const {
}
bool Launcher::customWorkingDir() const {
return _customWorkingDir;
return !_customWorkingDir.isEmpty();
}
void Launcher::prepareSettings() {
@@ -534,9 +546,9 @@ void Launcher::processArguments() {
gStartInTray = parseResult.contains("-startintray");
gQuit = parseResult.contains("-quit");
gSendPaths = parseResult.value("-sendpath", {});
cForceWorkingDir(parseResult.value("-workdir", {}).join(QString()));
if (!gWorkingDir.isEmpty()) {
_customWorkingDir = true;
_customWorkingDir = parseResult.value("-workdir", {}).join(QString());
if (!_customWorkingDir.isEmpty()) {
_customWorkingDir = QDir(_customWorkingDir).absolutePath() + '/';
}
gStartUrl = parseResult.value("--", {}).join(QString());