diff options
| author | isanae <14251494+isanae@users.noreply.github.com> | 2019-05-28 10:14:15 -0400 |
|---|---|---|
| committer | isanae <14251494+isanae@users.noreply.github.com> | 2019-05-28 10:14:15 -0400 |
| commit | adb5ace7997c4cf8ed5e0bee726478c8e1593524 (patch) | |
| tree | 5201005514cb268f7d66fdecdaf63eff7d849732 /src/modinfodialog.cpp | |
| parent | 2d52299743d056ae6da3c98ca9dc34abca3138bf (diff) | |
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
Diffstat (limited to 'src/modinfodialog.cpp')
| -rw-r--r-- | src/modinfodialog.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 |