From adb5ace7997c4cf8ed5e0bee726478c8e1593524 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Tue, 28 May 2019 10:14:15 -0400 Subject: added selectedOrigin to previewFileWithAlternatives() this is so that an origin other than the primary can be shown first and is used from previewDataFile() in ModInfoDialog since showing a preview for a conflicting file could initially show the file from the wrong mod removed unused, uninitialized and dangerous ModInfoDialog::m_OriginID --- src/modinfodialog.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/modinfodialog.cpp') diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp index 024679f3..fd8093d1 100644 --- a/src/modinfodialog.cpp +++ b/src/modinfodialog.cpp @@ -1740,8 +1740,10 @@ 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); + m_OrganizerCore->previewFileWithAlternatives(this, fileName, originId); } bool ModInfoDialog::canPreviewFile(bool isArchive, const QString& filename) const -- cgit v1.3.1