From 8d6c715672023577dca5a6528ff49081dede1052 Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Wed, 11 Apr 2018 17:46:59 -0500
Subject: Initial archive conflict parsing

Squashed commit:
  Basic archive conflict parsing - pass 1
  Merge fixes for archive parsing
  Basic archive conflict parsing - pass 1
  Merge fixes for archive parsing
  Should fix conflict detection for archive files
---
 src/syncoverwritedialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/syncoverwritedialog.cpp')

diff --git a/src/syncoverwritedialog.cpp b/src/syncoverwritedialog.cpp
index f03e29c5..7c341567 100644
--- a/src/syncoverwritedialog.cpp
+++ b/src/syncoverwritedialog.cpp
@@ -98,8 +98,8 @@ void SyncOverwriteDialog::readTree(const QString &path, DirectoryEntry *director
         bool ignore;
         int origin = entry->getOrigin(ignore);
         addToComboBox(combo, ToQString(m_DirectoryStructure->getOriginByID(origin).getName()), origin);
-        const std::vector<std::pair<int, std::wstring>> &alternatives = entry->getAlternatives();
-        for (std::vector<std::pair<int, std::wstring>>::const_iterator iter = alternatives.begin(); iter != alternatives.end(); ++iter) {
+        const std::vector<std::pair<int, std::pair<std::wstring, int>>> &alternatives = entry->getAlternatives();
+        for (std::vector<std::pair<int, std::pair<std::wstring, int>>>::const_iterator iter = alternatives.begin(); iter != alternatives.end(); ++iter) {
           addToComboBox(combo, ToQString(m_DirectoryStructure->getOriginByID(iter->first).getName()), iter->first);
         }
         combo->setCurrentIndex(combo->count() - 1);
-- 
cgit v1.3.1