- now avoids a few unnecessary copy operations during generation of the directory structure

- bugfix: circular dependency caused a memory leak
- bugfix: removing a single mod lead to the wrong mod being deleted

1 files changed, 2 insertions, 2 deletions

diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index 00b7c2af..1bb2daad 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -671,7 +671,7 @@ ModInfoRegular::EConflictType ModInfoRegular::isConflicted() const
   std::wstring name = ToWString(m_Name);
   if ((*m_DirectoryStructure)->originExists(name)) {
     FilesOrigin &origin = (*m_DirectoryStructure)->getOriginByName(name);
-    std::vector<FileEntry*> files = origin.getFiles();
+    std::vector<FileEntry::Ptr> files = origin.getFiles();
     for (auto iter = files.begin(); iter != files.end() && (!overwrite || !overwritten || !regular); ++iter) {
       const std::vector<int> &alternatives = (*iter)->getAlternatives();
       if (alternatives.size() == 0) {
@@ -716,7 +716,7 @@ bool ModInfoRegular::isRedundant() const
   std::wstring name = ToWString(m_Name);
   if ((*m_DirectoryStructure)->originExists(name)) {
     FilesOrigin &origin = (*m_DirectoryStructure)->getOriginByName(name);
-    std::vector<FileEntry*> files = origin.getFiles();
+    std::vector<FileEntry::Ptr> files = origin.getFiles();
     bool ignore = false;
     for (auto iter = files.begin(); iter != files.end(); ++iter) {
       if ((*iter)->getOrigin(ignore) == origin.getID()) {