aboutsummaryrefslogtreecommitdiff
path: root/launcher/FileSystem.cpp
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-12-26 17:48:43 +0100
committerGitHub <noreply@github.com>2022-12-26 17:48:43 +0100
commit6ea1234a3bb9787a77680ff528f21bdf1e40989c (patch)
tree1385918c5819df035dd5bd7b8f6bab7fc534c396 /launcher/FileSystem.cpp
parentdd3848d7b161e415c34c3c1c393985b644a88f1c (diff)
parent434f639b0c9af355703d6c64cfe5bbe9a28d0b9b (diff)
downloadPrismLauncher-6ea1234a3bb9787a77680ff528f21bdf1e40989c.tar.gz
PrismLauncher-6ea1234a3bb9787a77680ff528f21bdf1e40989c.tar.bz2
PrismLauncher-6ea1234a3bb9787a77680ff528f21bdf1e40989c.zip
Merge pull request #618 from TheKodeToad/safer-destructive-actions
Fixes https://github.com/PolyMC/PolyMC/issues/948
Diffstat (limited to 'launcher/FileSystem.cpp')
-rw-r--r--launcher/FileSystem.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/launcher/FileSystem.cpp b/launcher/FileSystem.cpp
index 3e8e10a5..b3af4f4e 100644
--- a/launcher/FileSystem.cpp
+++ b/launcher/FileSystem.cpp
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
- * PolyMC - Minecraft Launcher
+ * Prism Launcher - Minecraft Launcher
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ * Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -226,7 +227,7 @@ bool deletePath(QString path)
return err.value() == 0;
}
-bool trash(QString path, QString *pathInTrash = nullptr)
+bool trash(QString path, QString *pathInTrash)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
return false;