diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-04-07 22:24:15 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-04-13 00:06:31 +0200 |
| commit | c7398dfdc581fbf36205fa826ad2aeadcd9b0122 (patch) | |
| tree | 4aa331c389c2aa4c0148354d600b556b5073ffca /logic | |
| parent | 0220fe4f9d7f07fa137a11597b3465c76cfbcae3 (diff) | |
| download | MultiMC-c7398dfdc581fbf36205fa826ad2aeadcd9b0122.tar MultiMC-c7398dfdc581fbf36205fa826ad2aeadcd9b0122.tar.gz MultiMC-c7398dfdc581fbf36205fa826ad2aeadcd9b0122.tar.lz MultiMC-c7398dfdc581fbf36205fa826ad2aeadcd9b0122.tar.xz MultiMC-c7398dfdc581fbf36205fa826ad2aeadcd9b0122.zip | |
GH-228 do not recurse into reparse points when deleting instances
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/BaseInstance.cpp | 2 | ||||
| -rw-r--r-- | logic/InstanceList.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp index 69bc7597..1c6d3e4b 100644 --- a/logic/BaseInstance.cpp +++ b/logic/BaseInstance.cpp @@ -61,7 +61,7 @@ void BaseInstance::iconUpdated(QString key) void BaseInstance::nuke() { - QDir(instanceRoot()).removeRecursively(); + deletePath(instanceRoot()); emit nuked(this); } diff --git a/logic/InstanceList.cpp b/logic/InstanceList.cpp index 4e295e7f..3bdceb51 100644 --- a/logic/InstanceList.cpp +++ b/logic/InstanceList.cpp @@ -503,7 +503,7 @@ InstanceList::copyInstance(InstancePtr &newInstance, InstancePtr &oldInstance, c qDebug() << instDir.toUtf8(); if (!copyPath(oldInstance->instanceRoot(), instDir, false)) { - rootDir.removeRecursively(); + deletePath(instDir); return InstanceList::CantCreateDir; } |