Merge pull request #154 from Silarn/mainline_dev

Implementing archive parsing some prioritization

1 files changed, 5 insertions, 5 deletions

diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index d43808b6..ccd2a122 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -266,22 +266,22 @@ void ModInfoDialog::refreshLists()
       QString fileName = relativeName.mid(0).prepend(m_RootPath);

       bool archive;

       if ((*iter)->getOrigin(archive) == m_Origin->getID()) {

-        std::vector<int> alternatives = (*iter)->getAlternatives();

+        std::vector<std::pair<int, std::wstring>> alternatives = (*iter)->getAlternatives();

         if (!alternatives.empty()) {

           std::wostringstream altString;

-          for (std::vector<int>::iterator altIter = alternatives.begin();

+          for (std::vector<std::pair<int, std::wstring>>::iterator altIter = alternatives.begin();

                altIter != alternatives.end(); ++altIter) {

             if (altIter != alternatives.begin()) {

               altString << ", ";

             }

-            altString << m_Directory->getOriginByID(*altIter).getName();

+            altString << m_Directory->getOriginByID(altIter->first).getName();

           }

           QStringList fields(relativeName.prepend("..."));

           fields.append(ToQString(altString.str()));

           QTreeWidgetItem *item = new QTreeWidgetItem(fields);

           item->setData(0, Qt::UserRole, fileName);

-          item->setData(1, Qt::UserRole, ToQString(m_Directory->getOriginByID(alternatives[0]).getName()));

-          item->setData(1, Qt::UserRole + 1, alternatives[0]);

+          item->setData(1, Qt::UserRole, ToQString(m_Directory->getOriginByID(alternatives.begin()->first).getName()));

+          item->setData(1, Qt::UserRole + 1, alternatives.begin()->first);

           item->setData(1, Qt::UserRole + 2, archive);

           ui->overwriteTree->addTopLevelItem(item);

           ++numOverwrite;