Merge pull request #695 from ModOrganizer2/Develop

Stage for Release 2.2.0

1 files changed, 5 insertions, 2 deletions

diff --git a/src/modinfooverwrite.cpp b/src/modinfooverwrite.cpp
index 742ae384..37c8c650 100644
--- a/src/modinfooverwrite.cpp
+++ b/src/modinfooverwrite.cpp
@@ -6,7 +6,8 @@
 #include <QApplication>
 #include <QDirIterator>
 
-ModInfoOverwrite::ModInfoOverwrite(PluginContainer *pluginContainer) : ModInfo(pluginContainer)
+ModInfoOverwrite::ModInfoOverwrite(PluginContainer *pluginContainer, MOShared::DirectoryEntry **directoryStructure) 
+  : ModInfoWithConflictInfo(pluginContainer, directoryStructure)
 {
   testValid();
 }
@@ -31,6 +32,8 @@ std::vector<ModInfo::EFlag> ModInfoOverwrite::getFlags() const
   result.push_back(FLAG_OVERWRITE);
   if (m_PluginSelected)
     result.push_back(FLAG_PLUGIN_SELECTED);
+  for (auto flag : ModInfoWithConflictInfo::getFlags())
+    result.push_back(flag);
   return result;
 }
 
@@ -49,7 +52,7 @@ QString ModInfoOverwrite::getDescription() const
             "modified (i.e. by the construction kit)");
 }
 
-QStringList ModInfoOverwrite::archives() const
+QStringList ModInfoOverwrite::archives(bool checkOnDisk) 
 {
   QStringList result;
   QDir dir(this->absolutePath());