diff options
| author | Chrono <me@disilla.org> | 2022-10-31 20:06:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 20:06:59 -0400 |
| commit | ce1a4857ccf2d2ac043a3d26cca455f2b03f24c4 (patch) | |
| tree | 35d02a383e3332ade87a7995fb669278f1632429 /launcher/FileSystem.cpp | |
| parent | dfdf739282792ca646bb284b3d83b2d2265a9d55 (diff) | |
| parent | 7086b1e65ceab38c823542af2c652726d2ad1e09 (diff) | |
| download | PrismLauncher-ce1a4857ccf2d2ac043a3d26cca455f2b03f24c4.tar.gz PrismLauncher-ce1a4857ccf2d2ac043a3d26cca455f2b03f24c4.tar.bz2 PrismLauncher-ce1a4857ccf2d2ac043a3d26cca455f2b03f24c4.zip | |
Merge branch 'PrismLauncher:develop' into develop
Diffstat (limited to 'launcher/FileSystem.cpp')
| -rw-r--r-- | launcher/FileSystem.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/launcher/FileSystem.cpp b/launcher/FileSystem.cpp index 76cfccb0..aaa75e6f 100644 --- a/launcher/FileSystem.cpp +++ b/launcher/FileSystem.cpp @@ -44,6 +44,7 @@ #include <QStandardPaths> #include <QTextStream> #include <QUrl> +#include "DesktopServices.h" #if defined Q_OS_WIN32 #include <objbase.h> @@ -228,6 +229,9 @@ bool trash(QString path, QString *pathInTrash = nullptr) #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) return false; #else + // FIXME: Figure out trash in Flatpak. Qt seemingly doesn't use the Trash portal + if (DesktopServices::isFlatpak()) + return false; return QFile::moveToTrash(path, pathInTrash); #endif } |