mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Improve current executable path computing.

Browse Source 
Fixes #960 (hopefully).
This commit is contained in:
John Preston
2017-08-15 20:12:57 +03:00
parent f2801d4775
commit 8e433971c9
13 changed files with 406 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Telegram/SourceFiles/settings.cpp
View File

@@ -163,13 +163,26 @@ void settingsParseArgs(int argc, char *argv[]) {
QStringList args;
for (int32 i = 0; i < argc; ++i) {
args.push_back('"' + fromUtf8Safe(argv[i]) + '"');
args.push_back(fromUtf8Safe(argv[i]));
}
gArguments = args.join(' ');
gExeDir = psCurrentExeDirectory(argc, argv);
gExeName = psCurrentExeName(argc, argv);
for (int32 i = 0; i < argc; ++i) {
auto path = Platform::CurrentExecutablePath(argc, argv);
LOG(("Executable path before check: %1").arg(path));
if (!path.isEmpty()) {
auto info = QFileInfo(path);
if (info.isSymLink()) {
info = info.symLinkTarget();
}
if (info.exists()) {
gExeDir = info.absoluteDir().absolutePath() + '/';
gExeName = info.fileName();
}
}
if (cExeName().isEmpty()) {
LOG(("WARNING: Could not compute executable path, some features will be disabled."));
}
for (auto i = 0; i != argc; ++i) {
if (qstr("-testmode") == argv[i]) {
gTestMode = true;
} else if (qstr("-debug") == argv[i]) {