From d47e94ea4dce253a9f26619ffcf6763e40edf00c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 14 Mar 2020 23:52:43 +0400
Subject: [PATCH] Fallback to launcher basename if FLATPAK_ID variable is empty
---
Telegram/SourceFiles/platform/linux/specific_linux.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 916a26360..9e77745bf 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -280,8 +280,16 @@ QString AppRuntimeDirectory() {
QStandardPaths::RuntimeLocation);
if (InSandbox()) {
+ const auto flatpakId = [&] {
+ if (!qEnvironmentVariableIsEmpty("FLATPAK_ID")) {
+ return QString::fromLatin1(qgetenv("FLATPAK_ID"));
+ } else {
+ return GetLauncherBasename();
+ }
+ }();
+
runtimeDir += qsl("/app/")
- + QString::fromLatin1(qgetenv("FLATPAK_ID"));
+ + flatpakId;
}
if (!QFileInfo::exists(runtimeDir)) { // non-systemd distros