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

Move cExeName checks

Browse source
This commit is contained in:
Ilya Fedin 2020-08-07 10:34:06 +04:00 • committed by John Preston
parent 580e6baee6
commit 47673bba50
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View file

@ -87,6 +87,10 @@ bool IsTrayIconSupported = true;
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
void PortalAutostart(bool autostart, bool silent = false) { void PortalAutostart(bool autostart, bool silent = false) {
if (cExeName().isEmpty()) {
return;
}
QVariantMap options; QVariantMap options;
options["reason"] = tr::lng_settings_auto_start(tr::now); options["reason"] = tr::lng_settings_auto_start(tr::now);
options["autostart"] = autostart; options["autostart"] = autostart;
@ -213,6 +217,10 @@ bool GenerateDesktopFile(
const QString &targetPath, const QString &targetPath,
const QString &args, const QString &args,
bool silent = false) { bool silent = false) {
if (targetPath.isEmpty() || cExeName().isEmpty()) {
return false;
}
DEBUG_LOG(("App Info: placing .desktop file to %1").arg(targetPath)); DEBUG_LOG(("App Info: placing .desktop file to %1").arg(targetPath));
if (!QDir(targetPath).exists()) QDir().mkpath(targetPath); if (!QDir(targetPath).exists()) QDir().mkpath(targetPath);
@ -725,7 +733,7 @@ QString SingleInstanceLocalServerName(const QString &hash) {
QString GetLauncherBasename() { QString GetLauncherBasename() {
static const auto Result = [&] { static const auto Result = [&] {
if (InSnap()) { if (InSnap() && !cExeName().isEmpty()) {
const auto snapNameKey = const auto snapNameKey =
qEnvironmentVariableIsSet("SNAP_INSTANCE_NAME") qEnvironmentVariableIsSet("SNAP_INSTANCE_NAME")
? "SNAP_INSTANCE_NAME" ? "SNAP_INSTANCE_NAME"
@ -736,7 +744,7 @@ QString GetLauncherBasename() {
.arg(cExeName()); .arg(cExeName());
} }
if (InAppImage()) { if (InAppImage() && !cExeName().isEmpty()) {
const auto appimagePath = qsl("file://%1%2") const auto appimagePath = qsl("file://%1%2")
.arg(cExeDir()) .arg(cExeDir())
.arg(cExeName()) .arg(cExeName())
@ -1187,10 +1195,6 @@ void finish() {
} }
void InstallMainDesktopFile() { void InstallMainDesktopFile() {
const auto home = getHomeDir();
if (home.isEmpty() || cExeName().isEmpty())
return;
static const auto DisabledByEnv = qEnvironmentVariableIsSet( static const auto DisabledByEnv = qEnvironmentVariableIsSet(
"TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION"); "TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION");
@ -1229,6 +1233,10 @@ void InstallMainDesktopFile() {
void RegisterCustomScheme(bool force) { void RegisterCustomScheme(bool force) {
#ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME #ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
if (cExeName().isEmpty()) {
return;
}
GError *error = nullptr; GError *error = nullptr;
const auto actualCommandlineBuilder = qsl("%1 --") const auto actualCommandlineBuilder = qsl("%1 --")
@ -1339,10 +1347,6 @@ bool psShowOpenWithMenu(int x, int y, const QString &file) {
} }
void psAutoStart(bool start, bool silent) { void psAutoStart(bool start, bool silent) {
const auto home = getHomeDir();
if (home.isEmpty() || cExeName().isEmpty())
return;
if (InFlatpak()) { if (InFlatpak()) {
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
PortalAutostart(start, silent); PortalAutostart(start, silent);