void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-19 07:37:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use Core::UpdaterDisabled where a check is for installed or not

Browse source
This commit is contained in:
Ilya Fedin 2020-10-27 23:30:49 +04:00 • committed by John Preston
parent fbacb6c0a4
commit 152f1ef17f
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -252,7 +252,7 @@ bool GenerateDesktopFile(
QFile target(targetFile);
if (target.open(QIODevice::WriteOnly)) {
if (IsStaticBinary() || InAppImage()) {
if (!Core::UpdaterDisabled()) {
fileText = fileText.replace(
QRegularExpression(
qsl("^TryExec=.*$"),
@ -719,7 +719,7 @@ bool IsGtkIntegrationForced() {
return false;
}
bool IsQtPluginsBundled() {
bool AreQtPluginsBundled() {
#ifdef DESKTOP_APP_USE_PACKAGED_LAZY
return true;
#else // DESKTOP_APP_USE_PACKAGED_LAZY
@ -834,7 +834,7 @@ QString SingleInstanceLocalServerName(const QString &hash) {
QString GetLauncherBasename() {
static const auto Result = [&] {
if ((IsStaticBinary() || InAppImage()) && !cExeName().isEmpty()) {
if (!Core::UpdaterDisabled() && !cExeName().isEmpty()) {
const auto appimagePath = qsl("file://%1%2")
.arg(cExeDir())
.arg(cExeName())
@ -1244,13 +1244,11 @@ void start() {
"this may lead to font issues.");
#endif // DESKTOP_APP_USE_PACKAGED_FONTS
if (IsQtPluginsBundled()) {
if (AreQtPluginsBundled()) {
qputenv("QT_WAYLAND_DECORATION", "material");
}
if ((IsStaticBinary()
|| InAppImage()
|| IsQtPluginsBundled())
if (AreQtPluginsBundled()
// it is handled by Qt for flatpak and snap
&& !InFlatpak()
&& !InSnap()) {
@ -1319,7 +1317,7 @@ void RegisterCustomScheme(bool force) {
GError *error = nullptr;
const auto neededCommandlineBuilder = qsl("%1 --")
.arg((IsStaticBinary() || InAppImage())
.arg(!Core::UpdaterDisabled()
? cExeDir() + cExeName()
: cExeName());

2
Telegram/SourceFiles/platform/linux/specific_linux.h
View file

@ -26,7 +26,7 @@ bool InAppImage();
bool IsStaticBinary();
bool UseGtkIntegration();
bool IsGtkIntegrationForced();
bool IsQtPluginsBundled();
bool AreQtPluginsBundled();
bool IsXDGDesktopPortalPresent();
bool UseXDGDesktopPortal();