void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use custom workdir even if it doesn't exist

Browse source
This commit is contained in:
Ilya Fedin 2023-02-19 07:18:17 +04:00 • committed by John Preston
parent 8099c28197
commit 9849b7adb6
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/SourceFiles/core/launcher.cpp
View file

@ -547,13 +547,9 @@ void Launcher::processArguments() {
gStartInTray = parseResult.contains("-startintray"); gStartInTray = parseResult.contains("-startintray");
gQuit = parseResult.contains("-quit"); gQuit = parseResult.contains("-quit");
gSendPaths = parseResult.value("-sendpath", {}); gSendPaths = parseResult.value("-sendpath", {});
gWorkingDir = parseResult.value("-workdir", {}).join(QString()); cForceWorkingDir(parseResult.value("-workdir", {}).join(QString()));
if (!gWorkingDir.isEmpty()) { if (!gWorkingDir.isEmpty()) {
if (QDir().exists(gWorkingDir)) { _customWorkingDir = true;
_customWorkingDir = true;
} else {
gWorkingDir = QString();
}
} }
gStartUrl = parseResult.value("--", {}).join(QString()); gStartUrl = parseResult.value("--", {}).join(QString());

2
Telegram/SourceFiles/logs.cpp
View file

@ -407,8 +407,6 @@ void start(not_null<Core::Launcher*> launcher) {
} }
} }
cForceWorkingDir(QDir(cWorkingDir()).absolutePath() + '/');
// WinRT build requires the working dir to stay the same for plugin loading. // WinRT build requires the working dir to stay the same for plugin loading.
#ifndef Q_OS_WINRT #ifndef Q_OS_WINRT
QDir().setCurrent(cWorkingDir()); QDir().setCurrent(cWorkingDir());

1
Telegram/SourceFiles/settings.h
View file

@ -51,6 +51,7 @@ DeclareSetting(QString, WorkingDir);
inline void cForceWorkingDir(const QString &newDir) { inline void cForceWorkingDir(const QString &newDir) {
cSetWorkingDir(newDir); cSetWorkingDir(newDir);
if (!gWorkingDir.isEmpty()) { if (!gWorkingDir.isEmpty()) {
cSetWorkingDir(QDir(gWorkingDir).absolutePath() + '/');
QDir().mkpath(gWorkingDir); QDir().mkpath(gWorkingDir);
QFile::setPermissions(gWorkingDir, QFile::setPermissions(gWorkingDir,
QFileDevice::ReadUser | QFileDevice::WriteUser | QFileDevice::ExeUser); QFileDevice::ReadUser | QFileDevice::WriteUser | QFileDevice::ExeUser);