diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-10-31 22:56:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 22:56:07 +0100 |
| commit | 7086b1e65ceab38c823542af2c652726d2ad1e09 (patch) | |
| tree | 94843563751681d535478ab61e714a8023ac0b45 /launcher/DesktopServices.cpp | |
| parent | c8adc4e356c4ff879bb720ecf5abb6e719e38818 (diff) | |
| parent | f2d445d27b1052a038cd94a5c514cee807abd894 (diff) | |
| download | PrismLauncher-7086b1e65ceab38c823542af2c652726d2ad1e09.tar.gz PrismLauncher-7086b1e65ceab38c823542af2c652726d2ad1e09.tar.bz2 PrismLauncher-7086b1e65ceab38c823542af2c652726d2ad1e09.zip | |
Merge pull request #351 from Scrumplex/fix-trash
Diffstat (limited to 'launcher/DesktopServices.cpp')
| -rw-r--r-- | launcher/DesktopServices.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/launcher/DesktopServices.cpp b/launcher/DesktopServices.cpp index c29cbe7d..302eaf96 100644 --- a/launcher/DesktopServices.cpp +++ b/launcher/DesktopServices.cpp @@ -119,7 +119,7 @@ bool openDirectory(const QString &path, bool ensureExists) return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath())); }; #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - if(!APPLICATION->isFlatpak()) + if(!isFlatpak()) { return IndirectOpen(f); } @@ -140,7 +140,7 @@ bool openFile(const QString &path) return QDesktopServices::openUrl(QUrl::fromLocalFile(path)); }; #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - if(!APPLICATION->isFlatpak()) + if(!isFlatpak()) { return IndirectOpen(f); } @@ -158,7 +158,7 @@ bool openFile(const QString &application, const QString &path, const QString &wo qDebug() << "Opening file" << path << "using" << application; #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave - if(!APPLICATION->isFlatpak()) + if(!isFlatpak()) { return IndirectOpen([&]() { @@ -178,7 +178,7 @@ bool run(const QString &application, const QStringList &args, const QString &wor { qDebug() << "Running" << application << "with args" << args.join(' '); #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - if(!APPLICATION->isFlatpak()) + if(!isFlatpak()) { // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave return IndirectOpen([&]() @@ -203,7 +203,7 @@ bool openUrl(const QUrl &url) return QDesktopServices::openUrl(url); }; #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - if(!APPLICATION->isFlatpak()) + if(!isFlatpak()) { return IndirectOpen(f); } @@ -216,4 +216,13 @@ bool openUrl(const QUrl &url) #endif } +bool isFlatpak() +{ +#ifdef Q_OS_LINUX + return QFile::exists("/.flatpak-info"); +#else + return false; +#endif +} + } |