Merge pull request #618 from TheKodeToad/safer-destructive-actions

Fixes https://github.com/PolyMC/PolyMC/issues/948
2022-12-26 17:48:43 +01:00
parent dd3848d7b1 434f639b0c
commit 6ea1234a3b
18 changed files with 254 additions and 88 deletions
--- a/launcher/minecraft/mod/Resource.cpp
+++ b/launcher/minecraft/mod/Resource.cpp
@ -143,5 +143,9 @@ bool Resource::enable(EnableAction action)
 bool Resource::destroy()
 {
    m_type = ResourceType::UNKNOWN;
+
+    if (FS::trash(m_file_info.filePath()))
+        return true;
+
    return FS::deletePath(m_file_info.filePath());
 }