diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-01-11 09:49:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 09:49:20 +0100 |
| commit | 219c5b323db769ffa699b1a5c420189823108cb0 (patch) | |
| tree | a0d3d73431b24efbabbb8733853749237383ccf4 /launcher | |
| parent | dd013209e8f31b4c3b5540c1cd6aa65af9637dcb (diff) | |
| parent | 391ef64c22f1e106983abe51027096f3bf772c15 (diff) | |
| download | PrismLauncher-219c5b323db769ffa699b1a5c420189823108cb0.tar.gz PrismLauncher-219c5b323db769ffa699b1a5c420189823108cb0.tar.bz2 PrismLauncher-219c5b323db769ffa699b1a5c420189823108cb0.zip | |
Merge pull request #731 from flowln/windows_server_trash
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/FileSystem.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/launcher/FileSystem.cpp b/launcher/FileSystem.cpp index 7a135811..aee5245d 100644 --- a/launcher/FileSystem.cpp +++ b/launcher/FileSystem.cpp @@ -57,6 +57,7 @@ #include <shlobj.h> #include <shobjidl.h> #include <sys/utime.h> +#include <versionhelpers.h> #include <windows.h> #include <winnls.h> #include <string> @@ -251,6 +252,10 @@ bool trash(QString path, QString *pathInTrash) // FIXME: Figure out trash in Flatpak. Qt seemingly doesn't use the Trash portal if (DesktopServices::isFlatpak()) return false; +#if defined Q_OS_WIN32 + if (IsWindowsServer()) + return false; +#endif return QFile::moveToTrash(path, pathInTrash); #endif } |