From ee92fa9fc89ab047a63716c48e13d3d0a76af4fb Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 28 May 2019 10:53:55 -0400
Subject: reverted change that showed the conflicted file first in the preview
 dialog I'm not sure how I got to the conclusion that this was a better idea:
 preview was always an option for those files, and it has always shown the
 winning file, so I changed some long-standing behaviour for no reason. I
 reverted that change, although I'm leaving the functionality in
 previewFileWithAlternatives() to specify the selected origin because it works
 and could be useful in the future

---
 src/modinfodialog.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index 06c065fe..b6a21705 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -1743,10 +1743,8 @@ void ModInfoDialog::previewDataFile(const QTreeWidgetItem* item)
     return;
   }
 
-  const int originId = (m_Origin ? m_Origin->getID() : -1);
-
   QString fileName = QDir::fromNativeSeparators(item->data(0, Qt::UserRole).toString());
-  m_OrganizerCore->previewFileWithAlternatives(this, fileName, originId);
+  m_OrganizerCore->previewFileWithAlternatives(this, fileName);
 }
 
 bool ModInfoDialog::canPreviewFile(bool isArchive, const QString& filename) const
-- 
cgit v1.3.1