diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-12-26 17:48:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-26 17:48:43 +0100 |
| commit | 6ea1234a3bb9787a77680ff528f21bdf1e40989c (patch) | |
| tree | 1385918c5819df035dd5bd7b8f6bab7fc534c396 /launcher/FileSystem.h | |
| parent | dd3848d7b161e415c34c3c1c393985b644a88f1c (diff) | |
| parent | 434f639b0c9af355703d6c64cfe5bbe9a28d0b9b (diff) | |
| download | PrismLauncher-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.h')
| -rw-r--r-- | launcher/FileSystem.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/launcher/FileSystem.h b/launcher/FileSystem.h index ac893725..15233b66 100644 --- a/launcher/FileSystem.h +++ b/launcher/FileSystem.h @@ -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 @@ -129,7 +130,7 @@ bool deletePath(QString path); /** * Trash a folder / file */ -bool trash(QString path, QString *pathInTrash); +bool trash(QString path, QString *pathInTrash = nullptr); QString PathCombine(const QString& path1, const QString& path2); QString PathCombine(const QString& path1, const QString& path2, const QString& path3); |