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/organizercore.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/organizercore.h') diff --git a/src/organizercore.h b/src/organizercore.h index e24227b7..8ed34e24 100644 --- a/src/organizercore.h +++ b/src/organizercore.h @@ -152,7 +152,7 @@ public: QFileInfo &binaryInfo, QString &arguments, FileExecutionTypes& type); bool executeFileVirtualized(QWidget* parent, const QFileInfo& targetInfo); - bool previewFileWithAlternatives(QWidget* parent, QString filename); + bool previewFileWithAlternatives(QWidget* parent, QString filename, int selectedOrigin=-1); bool previewFile(QWidget* parent, const QString& originName, const QString& path); void spawnBinary(const QFileInfo &binary, const QString &arguments = "", -- cgit v1.3.1